Bug 581688 - [MARTE] Remove Papyrus dependencies from static profile / restructure features - Move extensions related to the profile description for Papyrus from the plugin.xml in oep.marte.static.profile to oep.marte.static.profile.ui - Remove oep.uml.extensionpoints dependency in oep.marte.static.profile (no longer necessary) - Feature reorganization: - Remove view feature, contents is moved partly to textedit (VSL) and UI feature - Rename main feature to UI feature. It now contains property view, (obsolete) palette and profile registration - Textedit feature now contains all xtext-based VSL editors - Move plugins into folder associated with restructured feature [- Remove unsued dependency in oep.marte.vsl plugin] Signed-off-by: aradermache <ansgar.radermacher@cea.fr> Change-Id: I6678fad492eb0e34994a5a64f53cc07a68be8faf
diff --git a/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF index 11dc009..3c471d8 100644 --- a/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF +++ b/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
@@ -115,7 +115,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", org.eclipse.uml2.uml;bundle-version="3.1.0", org.eclipse.uml2.types;visibility:=reexport Bundle-Vendor: %providerName
diff --git a/core/org.eclipse.papyrus.marte.static.profile/plugin.xml b/core/org.eclipse.papyrus.marte.static.profile/plugin.xml index 2bb8793..27b1198 100644 --- a/core/org.eclipse.papyrus.marte.static.profile/plugin.xml +++ b/core/org.eclipse.papyrus.marte.static.profile/plugin.xml
@@ -12,26 +12,6 @@ target="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/"/> </extension> <extension - point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary"> - <library - description="MARTE Library (v1.1)" - iconpath="resources/icons/MARTE_16x16.gif" - name="MARTE_Library" - path="pathmap://Papyrus_LIBRARIES/MARTE_Library.library.uml" - provider="CEA LIST"> - </library> - </extension> - <extension - point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile"> - <profile - description="UML profile for MARTE (v1.1)" - iconpath="resources/icons/MARTE_16x16.gif" - name="MARTE" - path="pathmap://Papyrus_PROFILES/MARTE.profile.uml" - provider="CEA LIST"> - </profile> - </extension> - <extension point="org.eclipse.uml2.uml.generated_package"> <profile location="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_zaC5cAPHEdyeNfbOYuD9pg"
diff --git a/core/pom.xml b/core/pom.xml index dfa0f4d..2ef2163 100644 --- a/core/pom.xml +++ b/core/pom.xml
@@ -10,13 +10,10 @@ <artifactId>org.eclipse.papyrus.marte.core</artifactId> <packaging>pom</packaging> <name>MARTE Core</name> - <description>This module contains the different plugins relative to MARTE and VSL</description> + <description>This module contains the different plugins relative to MARTE</description> <modules> <module>org.eclipse.papyrus.marte.static.profile</module> - <module>org.eclipse.papyrus.marte.static.profile.ui</module> - <module>org.eclipse.papyrus.marte.vsl</module> - <module>org.eclipse.papyrus.marte.vsl.ui</module> </modules> </project>
diff --git a/pom.xml b/pom.xml index fc85490..e50b27e 100644 --- a/pom.xml +++ b/pom.xml
@@ -73,7 +73,7 @@ <modules> <module>core</module> - <module>view</module> + <module>ui</module> <module>textedit</module> <module>targetplatform</module> <module>releng</module>
diff --git a/releng/org.eclipse.papyrus.marte.core.feature/feature.xml b/releng/org.eclipse.papyrus.marte.core.feature/feature.xml index dc6cb47..ae775d8 100644 --- a/releng/org.eclipse.papyrus.marte.core.feature/feature.xml +++ b/releng/org.eclipse.papyrus.marte.core.feature/feature.xml
@@ -6,7 +6,7 @@ provider-name="%providerName"> <description url="https://eclipse.org/papyrus/"> - This feature provides a Papyrus implementation of the MARTE static profile. + This feature provides a Papyrus implementation of the MARTE static profile. Please note that a user will most likely want to install the UI feature, as the core feature does not register the profile with the Papyrus UI. </description> <copyright url="http://www.eclipse.org/legal/epl-v10.html">
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/.project b/releng/org.eclipse.papyrus.marte.main.feature/.project deleted file mode 100644 index 0d86878..0000000 --- a/releng/org.eclipse.papyrus.marte.main.feature/.project +++ /dev/null
@@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.marte.main.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/releng/org.eclipse.papyrus.marte.p2/category.xml b/releng/org.eclipse.papyrus.marte.p2/category.xml index 6df8643..c5f073b 100644 --- a/releng/org.eclipse.papyrus.marte.p2/category.xml +++ b/releng/org.eclipse.papyrus.marte.p2/category.xml
@@ -6,22 +6,16 @@ <feature id="org.eclipse.papyrus.marte.core.feature.source" url="features/org.eclipse.papyrus.marte.core.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature id="org.eclipse.papyrus.marte.main.feature" url="features/org.eclipse.papyrus.marte.main.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier"> + <feature id="org.eclipse.papyrus.marte.ui.feature" url="features/org.eclipse.papyrus.marte.ui.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature id="org.eclipse.papyrus.marte.main.feature.source" url="features/org.eclipse.papyrus.marte.main.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> + <feature id="org.eclipse.papyrus.marte.ui.feature.source" url="features/org.eclipse.papyrus.marte.ui.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature id="org.eclipse.papyrus.marte.view.feature" url="features/org.eclipse.papyrus.marte.view.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier"> + <feature id="org.eclipse.papyrus.marte.textedit.feature." url="features/org.eclipse.papyrus.marte.textedit.feature._1.2.3.qualifier.jar" version="1.2.3.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature id="org.eclipse.papyrus.marte.view.feature.source" url="features/org.eclipse.papyrus.marte.view.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> - <category name="org.eclipse.papyrus.category"/> - </feature> - <feature id="org.eclipse.papyrus.marte.textedit.feature" url="features/org.eclipse.papyrus.marte.textedit.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier"> - <category name="org.eclipse.papyrus.category"/> - </feature> - <feature id="org.eclipse.papyrus.marte.textedit.feature.source" url="features/org.eclipse.papyrus.marte.textedit.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> + <feature id="org.eclipse.papyrus.marte.textedit.feature..source" url="features/org.eclipse.papyrus.marte.textedit.feature..source_1.2.3.qualifier.jar" version="1.2.3.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> <category-def label="Papyrus MARTE Category" name="org.eclipse.papyrus.category">
diff --git a/releng/org.eclipse.papyrus.marte.product/category.xml b/releng/org.eclipse.papyrus.marte.product/category.xml index b784a54..0d4da1f 100644 --- a/releng/org.eclipse.papyrus.marte.product/category.xml +++ b/releng/org.eclipse.papyrus.marte.product/category.xml
@@ -2,8 +2,8 @@ <site> <feature id="org.eclipse.papyrus.marte.core.feature" url="features/org.eclipse.papyrus.marte.core.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> <feature id="org.eclipse.papyrus.marte.core.feature.source" url="features/org.eclipse.papyrus.marte.core.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> - <feature id="org.eclipse.papyrus.marte.view.feature" url="features/org.eclipse.papyrus.marte.view.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> - <feature id="org.eclipse.papyrus.marte.view.feature.source" url="features/org.eclipse.papyrus.marte.view.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> - <feature id="org.eclipse.papyrus.marte.textedit.feature" url="features/org.eclipse.papyrus.marte.textedit.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> - <feature id="org.eclipse.papyrus.marte.textedit.feature.source" url="features/org.eclipse.papyrus.marte.textedit.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> + <feature id="org.eclipse.papyrus.marte.textedit.feature." url="features/org.eclipse.papyrus.marte.textedit.feature._1.2.3.qualifier.jar" version="1.2.3.qualifier" /> + <feature id="org.eclipse.papyrus.marte.textedit.feature..source" url="features/org.eclipse.papyrus.marte.textedit.feature..source_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> + <feature id="org.eclipse.papyrus.marte.ui.feature" url="features/org.eclipse.papyrus.marte.ui.feature_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> + <feature id="org.eclipse.papyrus.marte.ui.feature.source" url="features/org.eclipse.papyrus.marte.ui.feature.source_1.2.3.qualifier.jar" version="1.2.3.qualifier" /> </site>
diff --git a/releng/org.eclipse.papyrus.marte.textedit.feature/feature.xml b/releng/org.eclipse.papyrus.marte.textedit.feature/feature.xml index 8c1deb5..1201c1e 100644 --- a/releng/org.eclipse.papyrus.marte.textedit.feature/feature.xml +++ b/releng/org.eclipse.papyrus.marte.textedit.feature/feature.xml
@@ -1,6 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.papyrus.marte.textedit.feature" + label="%featureName" + version="1.2.3.qualifier" + provider-name="%providerName"> -<feature id="org.eclipse.papyrus.marte.textedit.feature" label="%featureName" provider-name="%providerName" version="1.2.3.qualifier"> + <description url="https://eclipse.org/papyrus/"> + This feature provides text editors for MARTE and notably the value specification language (VSL). +It contains +- an xtext editor for VSL in general +- an xtext editor for VSL constraints +- an xtext editor for stereotype applicatioins with VSL + </description> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de @@ -17,12 +28,54 @@ %license </license> - <plugin download-size="0" id="org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext" install-size="0" unpack="false" version="0.0.0"/> + <includes + id="org.eclipse.papyrus.marte.core.feature" + version="0.0.0"/> - <plugin download-size="0" id="org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui" install-size="0" unpack="false" version="0.0.0"/> + <requires> + <import plugin="org.eclipse.papyrus.marte.static.profile.ui"/> + </requires> - <plugin download-size="0" id="org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext" install-size="0" unpack="false" version="0.0.0"/> + <plugin + id="org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> - <plugin download-size="0" id="org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui" install-size="0" unpack="false" version="0.0.0"/> + <plugin + id="org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> -</feature> \ No newline at end of file + <plugin + id="org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.marte.vsl" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.marte.vsl.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature>
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/.project b/releng/org.eclipse.papyrus.marte.ui.feature/.project similarity index 86% rename from releng/org.eclipse.papyrus.marte.view.feature/.project rename to releng/org.eclipse.papyrus.marte.ui.feature/.project index 7ee71f4..344b3fd 100644 --- a/releng/org.eclipse.papyrus.marte.view.feature/.project +++ b/releng/org.eclipse.papyrus.marte.ui.feature/.project
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.marte.view.feature</name> + <name>org.eclipse.papyrus.marte.ui.feature</name> <comment></comment> <projects> </projects>
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/build.properties b/releng/org.eclipse.papyrus.marte.ui.feature/build.properties similarity index 100% rename from releng/org.eclipse.papyrus.marte.main.feature/build.properties rename to releng/org.eclipse.papyrus.marte.ui.feature/build.properties
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/epl-v10.html b/releng/org.eclipse.papyrus.marte.ui.feature/epl-v10.html similarity index 100% rename from releng/org.eclipse.papyrus.marte.main.feature/epl-v10.html rename to releng/org.eclipse.papyrus.marte.ui.feature/epl-v10.html
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/feature.properties b/releng/org.eclipse.papyrus.marte.ui.feature/feature.properties similarity index 100% rename from releng/org.eclipse.papyrus.marte.main.feature/feature.properties rename to releng/org.eclipse.papyrus.marte.ui.feature/feature.properties
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/feature.xml b/releng/org.eclipse.papyrus.marte.ui.feature/feature.xml similarity index 72% rename from releng/org.eclipse.papyrus.marte.main.feature/feature.xml rename to releng/org.eclipse.papyrus.marte.ui.feature/feature.xml index 2fddc7f..5e07d6b 100644 --- a/releng/org.eclipse.papyrus.marte.main.feature/feature.xml +++ b/releng/org.eclipse.papyrus.marte.ui.feature/feature.xml
@@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="org.eclipse.papyrus.marte.main.feature" + id="org.eclipse.papyrus.marte.ui.feature" label="%featureName" version="1.2.3.qualifier" provider-name="%providerName"> <description url="https://eclipse.org/papyrus/"> - This feature provides a Papyrus implementation of the MARTE profile. It contains the static (in-memory) - and UI features dedicated to MARTE: - - Palette - - Properties view - - Xtext support + This feature provides a Papyrus implementation of the MARTE profile. +It contains the static profile and UI features dedicated to MARTE: +- Palette (incompatible with newer Papyrus versions) +- Properties view +- Profile registration for Papyrus </description> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> @@ -30,24 +30,17 @@ version="0.0.0"/> <plugin - id="org.eclipse.papyrus.marte.vsl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.papyrus.marte.vsl.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.papyrus.marte.static.profile.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.papyrus.marte.properties" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/license.html b/releng/org.eclipse.papyrus.marte.ui.feature/license.html similarity index 100% rename from releng/org.eclipse.papyrus.marte.main.feature/license.html rename to releng/org.eclipse.papyrus.marte.ui.feature/license.html
diff --git a/releng/org.eclipse.papyrus.marte.main.feature/pom.xml b/releng/org.eclipse.papyrus.marte.ui.feature/pom.xml similarity index 90% rename from releng/org.eclipse.papyrus.marte.main.feature/pom.xml rename to releng/org.eclipse.papyrus.marte.ui.feature/pom.xml index 8db5bad..9d02d52 100644 --- a/releng/org.eclipse.papyrus.marte.main.feature/pom.xml +++ b/releng/org.eclipse.papyrus.marte.ui.feature/pom.xml
@@ -7,7 +7,7 @@ <artifactId>org.eclipse.papyrus.marte.releng</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> - <artifactId>org.eclipse.papyrus.marte.main.feature</artifactId> + <artifactId>org.eclipse.papyrus.marte.ui.feature</artifactId> <packaging>eclipse-feature</packaging> <name>MARTE profile and VSL</name> <description>This feature adds a static MARTE profile and VSL support.</description>
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/build.properties b/releng/org.eclipse.papyrus.marte.view.feature/build.properties deleted file mode 100644 index cff2bd5..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/build.properties +++ /dev/null
@@ -1,6 +0,0 @@ -bin.includes = feature.xml,\ - epl-v10.html,\ - license.html,\ - feature.properties -src.includes = epl-v10.html,\ - license.html
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/epl-v10.html b/releng/org.eclipse.papyrus.marte.view.feature/epl-v10.html deleted file mode 100644 index cb1073a..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/epl-v10.html +++ /dev/null
@@ -1,304 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html xmlns:o="urn:schemas-microsoft-com:office:office" -xmlns:w="urn:schemas-microsoft-com:office:word" -xmlns="http://www.w3.org/TR/REC-html40"> - -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<link rel=File-List -href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"> -<title>Eclipse Public License - Version 1.0</title> -<style> -<!-- - /* Font Definitions */ -@font-face - { - panose-1:2 11 6 4 3 5 4 4 2 4; - mso-font-charset:0; - mso-font-pitch:variable; - mso-font-signature:553679495 -2147483648 8 0 66047 0;} - /* Style Definitions */ -p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:12.0pt; - } -p - {margin-right:0in; - mso-margin-top-alt:auto; - mso-margin-bottom-alt:auto; - margin-left:0in; - mso-pagination:widow-orphan; - font-size:12.0pt; - } -p.BalloonText, li.BalloonText, div.BalloonText - {mso-style-name:"Balloon Text"; - margin:0in; - margin-bottom:.0001pt; - mso-pagination:widow-orphan; - font-size:8.0pt; - - } -@page Section1 - {size:8.5in 11.0in; - margin:1.0in 1.25in 1.0in 1.25in; - mso-header-margin:.5in; - mso-footer-margin:.5in; - mso-paper-source:0;} -div.Section1 - {page:Section1;} ---> -</style> -</head> - -<body lang="EN-US" style='tab-interval:.5in'> - -<div class=Section1> - -<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b> -</p> - -<p><span style='font-size:10.0pt'>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.</span> </p> - -<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p> - -<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) -in the case of the initial Contributor, the initial code and documentation -distributed under this Agreement, and<br clear=left> -b) in the case of each subsequent Contributor:</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i) -changes to the Program, and</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) -additions to the Program;</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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 additions to the -Program which: (i) are separate modules of software distributed in conjunction -with the Program under their own license agreement, and (ii) are not derivative -works of the Program. </span></p> - -<p><span style='font-size:10.0pt'>"Contributor" means any person or -entity that distributes the Program.</span> </p> - -<p><span style='font-size:10.0pt'>"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. </span></p> - -<p><span style='font-size:10.0pt'>"Program" means the Contributions -distributed in accordance with this Agreement.</span> </p> - -<p><span style='font-size:10.0pt'>"Recipient" means anyone who -receives the Program under this Agreement, including all Contributors.</span> </p> - -<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) -Subject to the terms of this Agreement, each Contributor hereby grants Recipient -a non-exclusive, worldwide, royalty-free copyright license to<span -style='color:red'> </span>reproduce, prepare derivative works of, publicly -display, publicly perform, distribute and sublicense the Contribution of such -Contributor, if any, and such derivative works, in source code and object code -form.</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) -Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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 and object code 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. </span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p> - -<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p> - -<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the -Program in object code form under its own license agreement, provided that:</span> -</p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) -it complies with the terms and conditions of this Agreement; and</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) -its license agreement:</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i) -effectively disclaims on behalf of all 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; </span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii) -effectively excludes on behalf of all Contributors all liability for damages, -including direct, indirect, special, incidental and consequential damages, such -as lost profits; </span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii) -states that any provisions which differ from this Agreement are offered by that -Contributor alone and not by any other party; and</span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv) -states that source code for the Program is available from such Contributor, and -informs licensees how to obtain it in a reasonable manner on or through a -medium customarily used for software exchange.<span style='color:blue'> </span></span></p> - -<p><span style='font-size:10.0pt'>When the Program is made available in source -code form:</span> </p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a) -it must be made available under this Agreement; and </span></p> - -<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a -copy of this Agreement must be included with each copy of the Program. </span></p> - -<p><span style='font-size:10.0pt'>Contributors may not remove or alter any -copyright notices contained within the Program. </span></p> - -<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the -originator of its Contribution, if any, in a manner that reasonably allows -subsequent Recipients to identify the originator of the Contribution. </span></p> - -<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p> - -<p><span style='font-size:10.0pt'>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.</span> </p> - -<p><span style='font-size:10.0pt'>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.</span> </p> - -<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p> - -<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS -AGREEMENT, 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. </span></p> - -<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p> - -<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS -AGREEMENT, 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.</span> </p> - -<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p> - -<p><span style='font-size:10.0pt'>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.</span> </p> - -<p><span style='font-size:10.0pt'>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. </span></p> - -<p><span style='font-size:10.0pt'>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. </span></p> - -<p><span style='font-size:10.0pt'>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. 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.</span> </p> - -<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the -State of New York and the intellectual property laws of the United States of -America. No party to this Agreement will bring a legal action under this -Agreement more than one year after the cause of action arose. Each party waives -its rights to a jury trial in any resulting litigation.</span> </p> - -<p class=MsoNormal></p> - -</div> - -</body> - -</html> \ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/feature.properties b/releng/org.eclipse.papyrus.marte.view.feature/feature.properties deleted file mode 100644 index d5ae82e..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/feature.properties +++ /dev/null
@@ -1,138 +0,0 @@ -# NLS_MESSAGEFORMAT_VAR - -# "featureName" property - name of the feature -featureName=Papyrus Marte view - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse Modeling Project - -# "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\ -April 9, 2014\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 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.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 Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.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/releng/org.eclipse.papyrus.marte.view.feature/feature.xml b/releng/org.eclipse.papyrus.marte.view.feature/feature.xml deleted file mode 100644 index 83dd2e5..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/feature.xml +++ /dev/null
@@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<feature id="org.eclipse.papyrus.marte.view.feature" label="%featureName" provider-name="%providerName" version="1.2.3.qualifier"> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de -Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana -and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License -v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <plugin download-size="0" id="org.eclipse.papyrus.marte.properties" install-size="0" unpack="false" version="0.0.0"/> - -</feature> \ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/license.html b/releng/org.eclipse.papyrus.marte.view.feature/license.html deleted file mode 100644 index c3d34c3..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/license.html +++ /dev/null
@@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!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>Eclipse Foundation Software User Agreement</title> -</head> - -<body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 9, 2014</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 1.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-v10.html">http://www.eclipse.org/legal/epl-v10.html</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 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>
diff --git a/releng/org.eclipse.papyrus.marte.view.feature/pom.xml b/releng/org.eclipse.papyrus.marte.view.feature/pom.xml deleted file mode 100644 index c2bb119..0000000 --- a/releng/org.eclipse.papyrus.marte.view.feature/pom.xml +++ /dev/null
@@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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.marte</groupId> - <artifactId>org.eclipse.papyrus.marte.releng</artifactId> - <version>1.2.3-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.marte.view.feature</artifactId> - <packaging>eclipse-feature</packaging> - <name>MARTE View</name> - <description>This feature adds a properties view for MARTE.</description> -</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml index 36a786a..dd18a08 100644 --- a/releng/pom.xml +++ b/releng/pom.xml
@@ -10,11 +10,10 @@ <artifactId>org.eclipse.papyrus.marte.releng</artifactId> <packaging>pom</packaging> <name>MARTE Releng</name> - <description>This plug-in contains the different modules relatives to the releng of MARTE from update site, to feature, product and rcp.</description> + <description>This plug-in contains the different modules relatives to the releng of MARTE from update site, feature, product and rcp.</description> <modules> <module>org.eclipse.papyrus.marte.core.feature</module> - <module>org.eclipse.papyrus.marte.main.feature</module> - <module>org.eclipse.papyrus.marte.view.feature</module> + <module>org.eclipse.papyrus.marte.ui.feature</module> <module>org.eclipse.papyrus.marte.textedit.feature</module> </modules>
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/.classpath b/textedit/org.eclipse.papyrus.marte.vsl.ui/.classpath similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/.classpath rename to textedit/org.eclipse.papyrus.marte.vsl.ui/.classpath
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/.project b/textedit/org.eclipse.papyrus.marte.vsl.ui/.project similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/.project rename to textedit/org.eclipse.papyrus.marte.vsl.ui/.project
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.core.prefs b/textedit/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.core.prefs rename to textedit/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.ui.prefs b/textedit/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.ui.prefs rename to textedit/org.eclipse.papyrus.marte.vsl.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF b/textedit/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF rename to textedit/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/about.html b/textedit/org.eclipse.papyrus.marte.vsl.ui/about.html similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/about.html rename to textedit/org.eclipse.papyrus.marte.vsl.ui/about.html
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/build.properties b/textedit/org.eclipse.papyrus.marte.vsl.ui/build.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/build.properties rename to textedit/org.eclipse.papyrus.marte.vsl.ui/build.properties
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/plugin.properties b/textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/plugin.properties rename to textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.properties
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/plugin.xml b/textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/plugin.xml rename to textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.xml
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/plugin.xml_gen b/textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.xml_gen similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/plugin.xml_gen rename to textedit/org.eclipse.papyrus.marte.vsl.ui/plugin.xml_gen
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/pom.xml b/textedit/org.eclipse.papyrus.marte.vsl.ui/pom.xml similarity index 84% rename from core/org.eclipse.papyrus.marte.vsl.ui/pom.xml rename to textedit/org.eclipse.papyrus.marte.vsl.ui/pom.xml index 1d5d32c..e4df749 100644 --- a/core/org.eclipse.papyrus.marte.vsl.ui/pom.xml +++ b/textedit/org.eclipse.papyrus.marte.vsl.ui/pom.xml
@@ -3,10 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus.marte</groupId> - <artifactId>org.eclipse.papyrus.marte.core</artifactId> + <artifactId>org.eclipse.papyrus.marte.textedit</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.marte.vsl.ui</artifactId> <packaging>eclipse-plugin</packaging> <description>This module contains VSL UI</description> -</project> \ No newline at end of file +</project>
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/AbstractVSLUiModule.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/AbstractVSLUiModule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/AbstractVSLUiModule.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/AbstractVSLUiModule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/VSLExecutableExtensionFactory.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/VSLExecutableExtensionFactory.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/VSLExecutableExtensionFactory.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/VSLExecutableExtensionFactory.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/AbstractVSLProposalProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/AbstractVSLProposalProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/AbstractVSLProposalProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/AbstractVSLProposalProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/VSLParser.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/VSLParser.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/VSLParser.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/VSLParser.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.g b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.g similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.g rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.g
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.tokens b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.tokens similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.tokens rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSL.tokens
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLLexer.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLLexer.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLLexer.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLLexer.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLParser.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLParser.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLParser.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/contentassist/antlr/internal/InternalVSLParser.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/internal/VSLActivator.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/internal/VSLActivator.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/internal/VSLActivator.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src-gen/org/eclipse/papyrus/marte/vsl/ui/internal/VSLActivator.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/VSLUiModule.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/VSLUiModule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/VSLUiModule.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/VSLUiModule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/CopyOfVSLProposalProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/CopyOfVSLProposalProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/CopyOfVSLProposalProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/CopyOfVSLProposalProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/FeatureTree.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/FeatureTree.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/FeatureTree.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/FeatureTree.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/Tree.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/Tree.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/Tree.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/Tree.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLContentAssistProcessor.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLContentAssistProcessor.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLContentAssistProcessor.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLContentAssistProcessor.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalUtils.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalUtils.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalUtils.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalUtils.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLDescriptionLabelProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLDescriptionLabelProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLDescriptionLabelProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLDescriptionLabelProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLLabelProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLLabelProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLLabelProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/labeling/VSLLabelProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/outline/VSLOutlineTreeProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/outline/VSLOutlineTreeProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/outline/VSLOutlineTreeProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/outline/VSLOutlineTreeProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/quickfix/VSLQuickfixProvider.java b/textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/quickfix/VSLQuickfixProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/quickfix/VSLQuickfixProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/quickfix/VSLQuickfixProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/.classpath b/textedit/org.eclipse.papyrus.marte.vsl/.classpath similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/.classpath rename to textedit/org.eclipse.papyrus.marte.vsl/.classpath
diff --git a/core/org.eclipse.papyrus.marte.vsl/.project b/textedit/org.eclipse.papyrus.marte.vsl/.project similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/.project rename to textedit/org.eclipse.papyrus.marte.vsl/.project
diff --git a/core/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.core.prefs b/textedit/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.core.prefs rename to textedit/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.core.prefs
diff --git a/core/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.ui.prefs b/textedit/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.ui.prefs rename to textedit/org.eclipse.papyrus.marte.vsl/.settings/org.eclipse.jdt.ui.prefs
diff --git a/core/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF b/textedit/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF similarity index 83% rename from core/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF rename to textedit/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF index 1ab95cb..e0f4090 100644 --- a/core/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF +++ b/textedit/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
@@ -20,17 +20,13 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.generator;resolution:=optional, org.apache.commons.logging;resolution:=optional, - org.eclipse.emf.codegen.ecore;resolution:=optional, - org.eclipse.emf.mwe.utils;resolution:=optional, - com.ibm.icu;resolution:=optional, org.eclipse.xtext.util, org.eclipse.emf.ecore, org.eclipse.emf.common, org.antlr.runtime, org.eclipse.uml2.uml;bundle-version="4.0.0", org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0", - org.apache.log4j;bundle-version="1.2.15", - org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle-version="1.0.0" + org.apache.log4j;bundle-version="1.2.15" Bundle-Vendor: %providerName Bundle-Version: 1.2.3.qualifier Bundle-ManifestVersion: 2
diff --git a/core/org.eclipse.papyrus.marte.vsl/about.html b/textedit/org.eclipse.papyrus.marte.vsl/about.html similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/about.html rename to textedit/org.eclipse.papyrus.marte.vsl/about.html
diff --git a/core/org.eclipse.papyrus.marte.vsl/build.properties b/textedit/org.eclipse.papyrus.marte.vsl/build.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/build.properties rename to textedit/org.eclipse.papyrus.marte.vsl/build.properties
diff --git a/core/org.eclipse.papyrus.marte.vsl/model/Ecore.ecore b/textedit/org.eclipse.papyrus.marte.vsl/model/Ecore.ecore similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/model/Ecore.ecore rename to textedit/org.eclipse.papyrus.marte.vsl/model/Ecore.ecore
diff --git a/core/org.eclipse.papyrus.marte.vsl/model/Ecore.genmodel b/textedit/org.eclipse.papyrus.marte.vsl/model/Ecore.genmodel similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/model/Ecore.genmodel rename to textedit/org.eclipse.papyrus.marte.vsl/model/Ecore.genmodel
diff --git a/core/org.eclipse.papyrus.marte.vsl/model/UML.ecore b/textedit/org.eclipse.papyrus.marte.vsl/model/UML.ecore similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/model/UML.ecore rename to textedit/org.eclipse.papyrus.marte.vsl/model/UML.ecore
diff --git a/core/org.eclipse.papyrus.marte.vsl/model/UML.genmodel b/textedit/org.eclipse.papyrus.marte.vsl/model/UML.genmodel similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/model/UML.genmodel rename to textedit/org.eclipse.papyrus.marte.vsl/model/UML.genmodel
diff --git a/core/org.eclipse.papyrus.marte.vsl/plugin.properties b/textedit/org.eclipse.papyrus.marte.vsl/plugin.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/plugin.properties rename to textedit/org.eclipse.papyrus.marte.vsl/plugin.properties
diff --git a/core/org.eclipse.papyrus.marte.vsl/plugin.xml b/textedit/org.eclipse.papyrus.marte.vsl/plugin.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/plugin.xml rename to textedit/org.eclipse.papyrus.marte.vsl/plugin.xml
diff --git a/core/org.eclipse.papyrus.marte.vsl/plugin.xml_gen b/textedit/org.eclipse.papyrus.marte.vsl/plugin.xml_gen similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/plugin.xml_gen rename to textedit/org.eclipse.papyrus.marte.vsl/plugin.xml_gen
diff --git a/core/org.eclipse.papyrus.marte.vsl/pom.xml b/textedit/org.eclipse.papyrus.marte.vsl/pom.xml similarity index 89% rename from core/org.eclipse.papyrus.marte.vsl/pom.xml rename to textedit/org.eclipse.papyrus.marte.vsl/pom.xml index d525fa3..8cd5573 100644 --- a/core/org.eclipse.papyrus.marte.vsl/pom.xml +++ b/textedit/org.eclipse.papyrus.marte.vsl/pom.xml
@@ -4,10 +4,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus.marte</groupId> - <artifactId>org.eclipse.papyrus.marte.core</artifactId> + <artifactId>org.eclipse.papyrus.marte.textedit</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.marte.vsl</artifactId> <packaging>eclipse-plugin</packaging> <description>This module contains VSL functionalities</description> -</project> \ No newline at end of file +</project>
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/AbstractVSLRuntimeModule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/AbstractVSLRuntimeModule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/AbstractVSLRuntimeModule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/AbstractVSLRuntimeModule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.ecore b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.ecore similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.ecore rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.ecore
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.genmodel b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.genmodel similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.genmodel rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.genmodel
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xmi b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xmi similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xmi rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xmi
diff --git a/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xtextbin b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xtextbin new file mode 100644 index 0000000..09c722e --- /dev/null +++ b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSL.xtextbin Binary files differ
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetupGenerated.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetupGenerated.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetupGenerated.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetupGenerated.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parseTreeConstruction/VSLParsetreeConstructor.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parseTreeConstruction/VSLParsetreeConstructor.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parseTreeConstruction/VSLParsetreeConstructor.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parseTreeConstruction/VSLParsetreeConstructor.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLAntlrTokenFileProvider.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLAntlrTokenFileProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLAntlrTokenFileProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLAntlrTokenFileProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLParser.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLParser.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLParser.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/VSLParser.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.g b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.g similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.g rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.g
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.tokens b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.tokens similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.tokens rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSL.tokens
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLLexer.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLLexer.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLLexer.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLLexer.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLParser.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLParser.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLParser.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/parser/antlr/internal/InternalVSLParser.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/services/VSLGrammarAccess.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/services/VSLGrammarAccess.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/services/VSLGrammarAccess.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/services/VSLGrammarAccess.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AdditiveExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AdditiveExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AdditiveExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AdditiveExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AndOrXorExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AndOrXorExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AndOrXorExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/AndOrXorExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/BooleanLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/BooleanLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/BooleanLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/BooleanLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/CollectionOrTuple.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/CollectionOrTuple.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/CollectionOrTuple.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/CollectionOrTuple.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ConditionalExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ConditionalExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ConditionalExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ConditionalExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DataTypeName.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DataTypeName.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DataTypeName.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DataTypeName.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DateTimeLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DateTimeLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DateTimeLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DateTimeLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DefaultLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DefaultLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DefaultLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DefaultLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsName.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsName.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsName.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/DurationObsName.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/EqualityExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/EqualityExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/EqualityExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/EqualityExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Expression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Expression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Expression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Expression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsName.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsName.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsName.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/InstantObsName.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/IntegerLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/IntegerLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/IntegerLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/IntegerLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Interval.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Interval.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Interval.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Interval.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/JitterExp.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/JitterExp.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/JitterExp.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/JitterExp.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValueNamePairs.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValueNamePairs.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValueNamePairs.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValueNamePairs.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValues.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValues.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValues.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ListOfValues.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Literal.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Literal.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Literal.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Literal.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/MultiplicativeExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/MultiplicativeExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/MultiplicativeExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/MultiplicativeExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NameOrChoiceOrBehaviorCall.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NameOrChoiceOrBehaviorCall.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NameOrChoiceOrBehaviorCall.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NameOrChoiceOrBehaviorCall.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NullLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NullLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NullLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NullLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NumberLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NumberLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NumberLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/NumberLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/OperationCallExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/OperationCallExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/OperationCallExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/OperationCallExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PrimaryExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PrimaryExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PrimaryExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PrimaryExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PropertyCallExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PropertyCallExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PropertyCallExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/PropertyCallExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/QualifiedName.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/QualifiedName.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/QualifiedName.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/QualifiedName.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RealLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RealLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RealLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RealLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RelationalExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RelationalExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RelationalExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/RelationalExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/StringLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/StringLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/StringLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/StringLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/SuffixExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/SuffixExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/SuffixExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/SuffixExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/TimeExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/TimeExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/TimeExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/TimeExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Tuple.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Tuple.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Tuple.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/Tuple.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnaryExpression.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnaryExpression.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnaryExpression.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnaryExpression.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnlimitedLiteralRule.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnlimitedLiteralRule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnlimitedLiteralRule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/UnlimitedLiteralRule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLFactory.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLFactory.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLFactory.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLFactory.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLPackage.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLPackage.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLPackage.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VSLPackage.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueNamePair.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueNamePair.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueNamePair.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueNamePair.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueSpecification.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueSpecification.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueSpecification.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/ValueSpecification.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VariableDeclaration.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VariableDeclaration.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VariableDeclaration.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/VariableDeclaration.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AdditiveExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AdditiveExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AdditiveExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AdditiveExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AndOrXorExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AndOrXorExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AndOrXorExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/AndOrXorExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/BooleanLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/BooleanLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/BooleanLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/BooleanLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/CollectionOrTupleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/CollectionOrTupleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/CollectionOrTupleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/CollectionOrTupleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ConditionalExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ConditionalExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ConditionalExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ConditionalExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DataTypeNameImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DataTypeNameImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DataTypeNameImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DataTypeNameImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DateTimeLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DateTimeLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DateTimeLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DateTimeLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DefaultLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DefaultLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DefaultLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DefaultLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsNameImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsNameImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsNameImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/DurationObsNameImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/EqualityExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/EqualityExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/EqualityExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/EqualityExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsNameImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsNameImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsNameImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/InstantObsNameImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntegerLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntegerLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntegerLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntegerLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntervalImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntervalImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntervalImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/IntervalImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/JitterExpImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/JitterExpImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/JitterExpImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/JitterExpImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValueNamePairsImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValueNamePairsImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValueNamePairsImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValueNamePairsImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValuesImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValuesImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValuesImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ListOfValuesImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/LiteralImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/LiteralImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/LiteralImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/LiteralImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/MultiplicativeExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/MultiplicativeExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/MultiplicativeExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/MultiplicativeExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NameOrChoiceOrBehaviorCallImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NameOrChoiceOrBehaviorCallImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NameOrChoiceOrBehaviorCallImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NameOrChoiceOrBehaviorCallImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NullLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NullLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NullLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NullLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NumberLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NumberLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NumberLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/NumberLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/OperationCallExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/OperationCallExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/OperationCallExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/OperationCallExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PrimaryExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PrimaryExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PrimaryExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PrimaryExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PropertyCallExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PropertyCallExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PropertyCallExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/PropertyCallExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/QualifiedNameImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/QualifiedNameImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/QualifiedNameImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/QualifiedNameImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RealLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RealLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RealLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RealLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RelationalExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RelationalExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RelationalExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/RelationalExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/StringLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/StringLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/StringLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/StringLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/SuffixExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/SuffixExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/SuffixExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/SuffixExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TimeExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TimeExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TimeExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TimeExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TupleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TupleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TupleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/TupleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnaryExpressionImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnaryExpressionImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnaryExpressionImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnaryExpressionImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnlimitedLiteralRuleImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnlimitedLiteralRuleImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnlimitedLiteralRuleImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/UnlimitedLiteralRuleImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLFactoryImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLFactoryImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLFactoryImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLFactoryImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLPackageImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLPackageImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLPackageImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VSLPackageImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueNamePairImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueNamePairImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueNamePairImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueNamePairImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueSpecificationImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueSpecificationImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueSpecificationImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/ValueSpecificationImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VariableDeclarationImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VariableDeclarationImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VariableDeclarationImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/impl/VariableDeclarationImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLAdapterFactory.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLAdapterFactory.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLAdapterFactory.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLAdapterFactory.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceFactoryImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceFactoryImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceFactoryImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceFactoryImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceImpl.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceImpl.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceImpl.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLResourceImpl.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLSwitch.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLSwitch.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLSwitch.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLSwitch.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLXMLProcessor.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLXMLProcessor.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLXMLProcessor.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/vSL/util/VSLXMLProcessor.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/validation/AbstractVSLJavaValidator.java b/textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/validation/AbstractVSLJavaValidator.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/validation/AbstractVSLJavaValidator.java rename to textedit/org.eclipse.papyrus.marte.vsl/src-gen/org/eclipse/papyrus/marte/vsl/validation/AbstractVSLJavaValidator.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/Copy of VSLPostProcessor.ext b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/Copy of VSLPostProcessor.ext similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/Copy of VSLPostProcessor.ext rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/Copy of VSLPostProcessor.ext
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/GenerateVSL.mwe2 b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/GenerateVSL.mwe2 similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/GenerateVSL.mwe2 rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/GenerateVSL.mwe2
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSL.xtext b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSL.xtext similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSL.xtext rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSL.xtext
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLPostProcessor.ext b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLPostProcessor.ext similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLPostProcessor.ext rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLPostProcessor.ext
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLRuntimeModule.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLRuntimeModule.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLRuntimeModule.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLRuntimeModule.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetup.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetup.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetup.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/VSLStandaloneSetup.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/CopyOfVSLContextUtil.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/CopyOfVSLContextUtil.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/CopyOfVSLContextUtil.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/CopyOfVSLContextUtil.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLContextUtil.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLContextUtil.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLContextUtil.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLContextUtil.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLSerializationUtil.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLSerializationUtil.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLSerializationUtil.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLSerializationUtil.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLTypeInferenceUtil.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLTypeInferenceUtil.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLTypeInferenceUtil.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/VSLTypeInferenceUtil.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/XtendUtil.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/XtendUtil.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/XtendUtil.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/extensions/XtendUtil.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/formatting/VSLFormatter.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/formatting/VSLFormatter.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/formatting/VSLFormatter.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/formatting/VSLFormatter.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/VSLScopeProvider.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/VSLScopeProvider.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/VSLScopeProvider.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/VSLScopeProvider.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/ScopingVisitors.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/ScopingVisitors.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/ScopingVisitors.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/ScopingVisitors.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/Visitor.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/Visitor.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/Visitor.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/scoping/visitors/Visitor.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLErrorMessage.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLErrorMessage.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLErrorMessage.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLErrorMessage.java
diff --git a/core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLJavaValidator.java b/textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLJavaValidator.java similarity index 100% rename from core/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLJavaValidator.java rename to textedit/org.eclipse.papyrus.marte.vsl/src/org/eclipse/papyrus/marte/vsl/validation/VSLJavaValidator.java
diff --git a/textedit/pom.xml b/textedit/pom.xml index cc0a6ad..0c93795 100644 --- a/textedit/pom.xml +++ b/textedit/pom.xml
@@ -13,6 +13,8 @@ <description>This module contains the different plugins relative to Xtext features for MARTE</description> <modules> + <module>org.eclipse.papyrus.marte.vsl</module> + <module>org.eclipse.papyrus.marte.vsl.ui</module> <module>org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module> <module>org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module> <module>org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>
diff --git a/view/.project b/ui/.project similarity index 100% rename from view/.project rename to ui/.project
diff --git a/view/org.eclipse.papyrus.marte.properties/.classpath b/ui/org.eclipse.papyrus.marte.properties/.classpath similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/.classpath rename to ui/org.eclipse.papyrus.marte.properties/.classpath
diff --git a/view/org.eclipse.papyrus.marte.properties/.project b/ui/org.eclipse.papyrus.marte.properties/.project similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/.project rename to ui/org.eclipse.papyrus.marte.properties/.project
diff --git a/view/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.core.prefs rename to ui/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.core.prefs
diff --git a/view/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.ui.prefs rename to ui/org.eclipse.papyrus.marte.properties/.settings/org.eclipse.jdt.ui.prefs
diff --git a/view/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF b/ui/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF rename to ui/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
diff --git a/view/org.eclipse.papyrus.marte.properties/about.html b/ui/org.eclipse.papyrus.marte.properties/about.html similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/about.html rename to ui/org.eclipse.papyrus.marte.properties/about.html
diff --git a/view/org.eclipse.papyrus.marte.properties/build.properties b/ui/org.eclipse.papyrus.marte.properties/build.properties similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/build.properties rename to ui/org.eclipse.papyrus.marte.properties/build.properties
diff --git a/view/org.eclipse.papyrus.marte.properties/model/MARTE.ctx b/ui/org.eclipse.papyrus.marte.properties/model/MARTE.ctx similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/MARTE.ctx rename to ui/org.eclipse.papyrus.marte.properties/model/MARTE.ctx
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt b/ui/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt rename to ui/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt
diff --git a/view/org.eclipse.papyrus.marte.properties/plugin.xml b/ui/org.eclipse.papyrus.marte.properties/plugin.xml similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/plugin.xml rename to ui/org.eclipse.papyrus.marte.properties/plugin.xml
diff --git a/view/org.eclipse.papyrus.marte.properties/pom.xml b/ui/org.eclipse.papyrus.marte.properties/pom.xml similarity index 86% rename from view/org.eclipse.papyrus.marte.properties/pom.xml rename to ui/org.eclipse.papyrus.marte.properties/pom.xml index 6bec4a2..296a786 100644 --- a/view/org.eclipse.papyrus.marte.properties/pom.xml +++ b/ui/org.eclipse.papyrus.marte.properties/pom.xml
@@ -3,10 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus.marte</groupId> - <artifactId>org.eclipse.papyrus.marte.view</artifactId> + <artifactId>org.eclipse.papyrus.marte.ui</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.marte.properties</artifactId> <packaging>eclipse-plugin</packaging> <description>This module contains the MARTE properties view</description> -</project> \ No newline at end of file +</project>
diff --git a/view/org.eclipse.papyrus.marte.properties/src/org/eclipse/papyrus/marte/properties/Activator.java b/ui/org.eclipse.papyrus.marte.properties/src/org/eclipse/papyrus/marte/properties/Activator.java similarity index 100% rename from view/org.eclipse.papyrus.marte.properties/src/org/eclipse/papyrus/marte/properties/Activator.java rename to ui/org.eclipse.papyrus.marte.properties/src/org/eclipse/papyrus/marte/properties/Activator.java
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.classpath b/ui/org.eclipse.papyrus.marte.static.profile.ui/.classpath similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/.classpath rename to ui/org.eclipse.papyrus.marte.static.profile.ui/.classpath
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.project b/ui/org.eclipse.papyrus.marte.static.profile.ui/.project similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/.project rename to ui/org.eclipse.papyrus.marte.static.profile.ui/.project
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs rename to ui/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs rename to ui/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF rename to ui/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/about.html b/ui/org.eclipse.papyrus.marte.static.profile.ui/about.html similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/about.html rename to ui/org.eclipse.papyrus.marte.static.profile.ui/about.html
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/build.properties b/ui/org.eclipse.papyrus.marte.static.profile.ui/build.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/build.properties rename to ui/org.eclipse.papyrus.marte.static.profile.ui/build.properties
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties b/ui/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties rename to ui/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml similarity index 84% rename from core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml index f429972..6aa1d05 100644 --- a/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml +++ b/ui/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml
@@ -1,6 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> + <extension + point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary"> + <library + description="MARTE Library (v1.1)" + iconpath="resources/icons/MARTE_16x16.gif" + name="MARTE_Library" + path="pathmap://Papyrus_LIBRARIES/MARTE_Library.library.uml" + provider="CEA LIST"> + </library> + </extension> + <extension + point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile"> + <profile + description="UML profile for MARTE (v1.1)" + iconpath="resources/icons/MARTE_16x16.gif" + name="MARTE" + path="pathmap://Papyrus_PROFILES/MARTE.profile.uml" + provider="CEA LIST"> + </profile> + </extension> <extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"> @@ -23,7 +43,7 @@ <paletteDefinition ID="ClassDiagram-Alloc-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-Alloc-Palette" path="/palettes/ClassDiag-Alloc.Palette.xml"> <Priority @@ -39,7 +59,7 @@ <paletteDefinition ID="ClassDiagram-Time-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-Time-Palette" path="/palettes/ClassDiag-Time.Palette.xml"> <Priority @@ -55,7 +75,7 @@ <paletteDefinition ID="ClassDiagram-GRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-GRM-Palette" path="/palettes/ClassDiag-GRM.Palette.xml"> <Priority @@ -71,7 +91,7 @@ <paletteDefinition ID="ClassDiagram-GCM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-GCM-Palette" path="/palettes/ClassDiag-GCM.Palette.xml"> <Priority @@ -87,7 +107,7 @@ <paletteDefinition ID="ClassDiagram-HLAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-HLAM-Palette" path="/palettes/ClassDiag-HLAM.Palette.xml"> <Priority @@ -103,7 +123,7 @@ <paletteDefinition ID="ClassDiagram-HRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-HRM-Palette" path="/palettes/ClassDiag-HRM.Palette.xml"> <Priority @@ -119,7 +139,7 @@ <paletteDefinition ID="ClassDiagram-SRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-SRM-Palette" path="/palettes/ClassDiag-SRM.Palette.xml"> <Priority @@ -135,7 +155,7 @@ <paletteDefinition ID="ClassDiagram-GQAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ClassDiagram-GQAM-Palette" path="/palettes/ClassDiag-GQAM.Palette.xml"> <Priority @@ -151,7 +171,7 @@ <paletteDefinition ID="ActivityDiagram-GCM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-GCM-Palette" path="/palettes/ActivityDiag-GCM.Palette.xml"> <Priority @@ -167,7 +187,7 @@ <paletteDefinition ID="ActivityDiagram-HLAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-HLAM-Palette" path="/palettes/ActivityDiag-HLAM.Palette.xml"> <Priority @@ -182,7 +202,7 @@ <paletteDefinition ID="ActivityDiagram-GQAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-GQAM-Palette" path="/palettes/ActivityDiag-GQAM.Palette.xml"> <Priority @@ -197,7 +217,7 @@ <paletteDefinition ID="ActivityDiagram-NFPs-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-NFPs-Palette" path="/palettes/ActivityDiag-NFPs.Palette.xml"> <Priority @@ -213,7 +233,7 @@ <paletteDefinition ID="ActivityDiagram-PAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-PAM-Palette" path="/palettes/ActivityDiag-PAM.Palette.xml"> <Priority @@ -229,7 +249,7 @@ <paletteDefinition ID="ActivityDiagram-SAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-SAM-Palette" path="/palettes/ActivityDiag-SAM.Palette.xml"> <Priority @@ -245,7 +265,7 @@ <paletteDefinition ID="ActivityDiagram-Time-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="ActivityDiagram-Time-Palette" path="/palettes/ActivityDiag-Time.Palette.xml"> <Priority @@ -261,7 +281,7 @@ <paletteDefinition ID="CompositeDiagram-Alloc-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-Alloc-Palette" path="/palettes/CompositeDiag-Alloc.Palette.xml"> <Priority @@ -277,7 +297,7 @@ <paletteDefinition ID="CompositeDiagram-CoreElements-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-CoreElements-Palette" path="/palettes/CompositeDiag-CoreElements.Palette.xml"> <Priority @@ -293,7 +313,7 @@ <paletteDefinition ID="CompositeDiagram-GCM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-GCM-Palette" path="/palettes/CompositeDiag-GCM.Palette.xml"> <Priority @@ -309,7 +329,7 @@ <paletteDefinition ID="CompositeDiagram-GRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-GRM-Palette" path="/palettes/CompositeDiag-GRM.Palette.xml"> <Priority @@ -325,7 +345,7 @@ <paletteDefinition ID="CompositeDiagram-HLAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-HLAM-Palette" path="/palettes/CompositeDiag-HLAM.Palette.xml"> <Priority @@ -341,7 +361,7 @@ <paletteDefinition ID="CompositeDiagram-HRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-HRM-Palette" path="/palettes/CompositeDiag-HRM.Palette.xml"> <Priority @@ -357,7 +377,7 @@ <paletteDefinition ID="CompositeDiagram-NFPs-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-NFPs-Palette" path="/palettes/CompositeDiag-NFPs.Palette.xml"> <Priority @@ -373,7 +393,7 @@ <paletteDefinition ID="CompositeDiagram-PAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-PAM-Palette" path="/palettes/CompositeDiag-PAM.Palette.xml"> <Priority @@ -389,7 +409,7 @@ <paletteDefinition ID="CompositeDiagram-SAM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-SAM-Palette" path="/palettes/CompositeDiag-SAM.Palette.xml"> <Priority @@ -405,7 +425,7 @@ <paletteDefinition ID="CompositeDiagram-SRM-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-SRM-Palette" path="/palettes/CompositeDiag-SRM.Palette.xml"> <Priority @@ -421,7 +441,7 @@ <paletteDefinition ID="CompositeDiagram-Time-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="CompositeDiagram-Time-Palette" path="/palettes/CompositeDiag-Time.Palette.xml"> <Priority @@ -437,7 +457,7 @@ <paletteDefinition ID="StateMachineDiagram-CoreElements-Palette" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" - icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif" + icon="resources/icons/MARTE_16x16.gif" name="StateMachineDiagram-CoreElements-Palette" path="/palettes/StateMachineDiag-CoreElements.Palette.xml"> <Priority
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml b/ui/org.eclipse.papyrus.marte.static.profile.ui/pom.xml similarity index 60% rename from core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml rename to ui/org.eclipse.papyrus.marte.static.profile.ui/pom.xml index e9749df..eca395c 100644 --- a/core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml +++ b/ui/org.eclipse.papyrus.marte.static.profile.ui/pom.xml
@@ -3,10 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus.marte</groupId> - <artifactId>org.eclipse.papyrus.marte.core</artifactId> + <artifactId>org.eclipse.papyrus.marte.ui</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.marte.static.profile.ui</artifactId> <packaging>eclipse-plugin</packaging> - <description>This module contains the UML profile for MARTE (Modeling and Analysis of Real-Time Embedded systems)</description> + <description>This module contains the UI part of the UML profile for MARTE (Modeling and Analysis of Real-Time Embedded systems)</description> </project>
diff --git a/core/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif b/ui/org.eclipse.papyrus.marte.static.profile.ui/resources/icons/MARTE_16x16.gif similarity index 100% rename from core/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif rename to ui/org.eclipse.papyrus.marte.static.profile.ui/resources/icons/MARTE_16x16.gif Binary files differ
diff --git a/view/pom.xml b/ui/pom.xml similarity index 80% rename from view/pom.xml rename to ui/pom.xml index d077d98..1122159 100644 --- a/view/pom.xml +++ b/ui/pom.xml
@@ -7,13 +7,14 @@ <artifactId>org.eclipse.papyrus.marte.parent</artifactId> <version>1.2.3-SNAPSHOT</version> </parent> - <artifactId>org.eclipse.papyrus.marte.view</artifactId> + <artifactId>org.eclipse.papyrus.marte.ui</artifactId> <packaging>pom</packaging> <name>MARTE View</name> - <description>This module contains the different plugins relative to the MARTE views</description> + <description>This module contains the different plugins relative to the MARTE UI aspects</description> <modules> <module>org.eclipse.papyrus.marte.properties</module> + <module>org.eclipse.papyrus.marte.static.profile.ui</module> </modules> </project>
