[Releng][PropertiesView] Move Properties view plugins in their own
folder
Change-Id: I6ea5108a1ce7d8b34f5c158fc0d439a15e563508
Signed-off-by: Jessy Mallet <jessy.mallet@obeo.fr>
diff --git a/features/org.eclipse.papyrus.sirius.properties.uml.feature/feature.xml b/features/org.eclipse.papyrus.sirius.properties.uml.feature/feature.xml
index ba81e33..1df5c73 100644
--- a/features/org.eclipse.papyrus.sirius.properties.uml.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sirius.properties.uml.feature/feature.xml
@@ -53,7 +53,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls"
+ id="org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c827a6d..bdd5a0c 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,6 +22,7 @@
<module>doc</module>
<module>editor</module>
<module>uml</module>
+ <module>properties</module>
<module>org.eclipse.papyrus.sirius.log</module>
</modules>
</project>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ContainerBorderDescription.gif b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ContainerBorderDescription.gif
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ContainerBorderDescription.gif
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ContainerBorderDescription.gif
Binary files differ
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ExtEditableReferenceDescription.gif b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ExtEditableReferenceDescription.gif
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ExtEditableReferenceDescription.gif
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/ExtEditableReferenceDescription.gif
Binary files differ
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/LanguageExpressionDescription.gif b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/LanguageExpressionDescription.gif
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/LanguageExpressionDescription.gif
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/icons/full/obj16/LanguageExpressionDescription.gif
Binary files differ
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml
similarity index 98%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml
index 2df56b0..ba6a936 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/plugin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
Copyright (c) 2022 CEA, Obeo
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml
index 17fd0bd..ab9e0d7 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ContainerBorderDescriptionItemProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ContainerBorderDescriptionItemProvider.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ContainerBorderDescriptionItemProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ContainerBorderDescriptionItemProvider.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ExtEditableReferenceDescriptionItemProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ExtEditableReferenceDescriptionItemProvider.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ExtEditableReferenceDescriptionItemProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/ExtEditableReferenceDescriptionItemProvider.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/LanguageExpressionDescriptionItemProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/LanguageExpressionDescriptionItemProvider.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/LanguageExpressionDescriptionItemProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/LanguageExpressionDescriptionItemProvider.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesAdvancedControlsItemProviderAdapterFactory.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesAdvancedControlsItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesAdvancedControlsItemProviderAdapterFactory.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesAdvancedControlsItemProviderAdapterFactory.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesadvancedcontrolsEditPlugin.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesadvancedcontrolsEditPlugin.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesadvancedcontrolsEditPlugin.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/provider/PropertiesadvancedcontrolsEditPlugin.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
similarity index 86%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
index bda56e5..6e7358c 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
Bundle-Localization: plugin
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
+ org.eclipse.sirius.model;bundle-version="[7.0.2,8.0.0)",
org.eclipse.sirius.properties;bundle-version="[7.0.2,8.0.0)",
- org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[7.0.2,8.0.0)",
- org.eclipse.sirius.model;bundle-version="[7.0.2,8.0.0)"
+ org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[7.0.2,8.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.ecore b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.ecore
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.ecore
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.ecore
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.genmodel b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.genmodel
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.genmodel
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/model/properties-advanced-controls.genmodel
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.xml
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/plugin.xml
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml
index 14b832f..56164b3 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ContainerBorderDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ContainerBorderDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ContainerBorderDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ContainerBorderDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ExtEditableReferenceDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ExtEditableReferenceDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ExtEditableReferenceDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/ExtEditableReferenceDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/LanguageExpressionDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/LanguageExpressionDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/LanguageExpressionDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/LanguageExpressionDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsFactory.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsFactory.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsFactory.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsFactory.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsPackage.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsPackage.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsPackage.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/PropertiesAdvancedControlsPackage.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ContainerBorderDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ContainerBorderDescriptionImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ContainerBorderDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ContainerBorderDescriptionImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ExtEditableReferenceDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ExtEditableReferenceDescriptionImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ExtEditableReferenceDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/ExtEditableReferenceDescriptionImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/LanguageExpressionDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/LanguageExpressionDescriptionImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/LanguageExpressionDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/LanguageExpressionDescriptionImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsFactoryImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsFactoryImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsFactoryImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsFactoryImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsPackageImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsPackageImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsPackageImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/impl/PropertiesAdvancedControlsPackageImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsAdapterFactory.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsAdapterFactory.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsAdapterFactory.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsAdapterFactory.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsSwitch.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsSwitch.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsSwitch.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/src-gen/org/eclipse/papyrus/sirius/properties/advanced/controls/propertiesadvancedcontrols/util/PropertiesAdvancedControlsSwitch.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/META-INF/MANIFEST.MF
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml
similarity index 97%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml
index 2ddbee7..264862b 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/plugin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
Copyright (c) 2022 CEA, Obeo
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
index 819c4e8..b56d1ea 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/Activator.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/Activator.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/Activator.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/Activator.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionFilter.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionFilter.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionFilter.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionFilter.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionPropertySection.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionPropertySection.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionPropertySection.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/containerborder/internal/ContainerBorderDescriptionLabelExpressionPropertySection.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/META-INF/MANIFEST.MF
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.ecore b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.ecore
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.ecore
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.ecore
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.genmodel b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.genmodel
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.genmodel
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/model/eef-advanced-controls.genmodel
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.xml
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/plugin.xml
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml
index 1f6ba7a..6abcb8a 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFContainerBorderDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFContainerBorderDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFContainerBorderDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFContainerBorderDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFExtEditableReferenceDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFExtEditableReferenceDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFExtEditableReferenceDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFExtEditableReferenceDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFLanguageExpressionDescription.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFLanguageExpressionDescription.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFLanguageExpressionDescription.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EEFLanguageExpressionDescription.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsFactory.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsFactory.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsFactory.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsFactory.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java
similarity index 96%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java
index c782544..f4be0af 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/EefAdvancedControlsPackage.java
@@ -14,7 +14,9 @@
package org.eclipse.papyrus.sirius.properties.eef.advanced.controls;
import org.eclipse.eef.EefPackage;
+
import org.eclipse.eef.ext.widgets.reference.eefextwidgetsreference.EefExtWidgetsReferencePackage;
+
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
@@ -24,14 +26,13 @@
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EefAdvancedControlsFactory
* @model kind="package"
* @generated
@@ -41,7 +42,6 @@
* The package name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNAME = "eefadvancedcontrols"; //$NON-NLS-1$
@@ -50,7 +50,6 @@
* The package namespace URI.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNS_URI = "http://www.eclipse.org/papyrus/sirius/properties/eef/advanced/controls"; //$NON-NLS-1$
@@ -59,7 +58,6 @@
* The package namespace name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
String eNS_PREFIX = "eef-advanced-controls"; //$NON-NLS-1$
@@ -68,7 +66,6 @@
* The singleton instance of the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EefAdvancedControlsPackage eINSTANCE = org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl.init();
@@ -77,7 +74,6 @@
* The meta object id for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFExtEditableReferenceDescriptionImpl <em>EEF Ext Editable Reference Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFExtEditableReferenceDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFExtEditableReferenceDescription()
* @generated
@@ -88,7 +84,6 @@
* The feature id for the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -98,7 +93,6 @@
* The feature id for the '<em><b>Label Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -108,7 +102,6 @@
* The feature id for the '<em><b>Help Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -118,7 +111,6 @@
* The feature id for the '<em><b>Is Enabled Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -128,7 +120,6 @@
* The feature id for the '<em><b>Property Validation Rules</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -138,7 +129,6 @@
* The feature id for the '<em><b>Reference Name Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -148,7 +138,6 @@
* The feature id for the '<em><b>Reference Owner Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -158,7 +147,6 @@
* The feature id for the '<em><b>On Click Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -168,7 +156,6 @@
* The feature id for the '<em><b>Style</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -178,7 +165,6 @@
* The feature id for the '<em><b>Conditional Styles</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -188,7 +174,6 @@
* The number of structural features of the '<em>EEF Ext Editable Reference Description</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -198,7 +183,6 @@
* The meta object id for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl <em>EEF Container Border Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFContainerBorderDescription()
* @generated
@@ -209,7 +193,6 @@
* The feature id for the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -219,7 +202,6 @@
* The feature id for the '<em><b>Controls</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -229,7 +211,6 @@
* The feature id for the '<em><b>Layout</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -239,7 +220,6 @@
* The feature id for the '<em><b>Label Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -249,7 +229,6 @@
* The number of structural features of the '<em>EEF Container Border Description</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -259,7 +238,6 @@
* The meta object id for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFLanguageExpressionDescriptionImpl <em>EEF Language Expression Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFLanguageExpressionDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFLanguageExpressionDescription()
* @generated
@@ -270,7 +248,6 @@
* The feature id for the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -280,7 +257,6 @@
* The feature id for the '<em><b>Label Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -290,7 +266,6 @@
* The feature id for the '<em><b>Help Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -300,7 +275,6 @@
* The feature id for the '<em><b>Is Enabled Expression</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -310,7 +284,6 @@
* The feature id for the '<em><b>Property Validation Rules</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -320,7 +293,6 @@
* The number of structural features of the '<em>EEF Language Expression Description</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -330,7 +302,6 @@
* Returns the meta object for class '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription <em>EEF Ext Editable Reference Description</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>EEF Ext Editable Reference Description</em>'.
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription
* @generated
@@ -341,7 +312,6 @@
* Returns the meta object for class '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription <em>EEF Container Border Description</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>EEF Container Border Description</em>'.
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription
* @generated
@@ -352,7 +322,6 @@
* Returns the meta object for the attribute '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription#getLabelExpression <em>Label Expression</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Label Expression</em>'.
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription#getLabelExpression()
* @see #getEEFContainerBorderDescription()
@@ -364,7 +333,6 @@
* Returns the meta object for class '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFLanguageExpressionDescription <em>EEF Language Expression Description</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the meta object for class '<em>EEF Language Expression Description</em>'.
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFLanguageExpressionDescription
* @generated
@@ -375,7 +343,6 @@
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -385,14 +352,13 @@
* <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @generated
*/
interface Literals {
@@ -400,7 +366,6 @@
* The meta object literal for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFExtEditableReferenceDescriptionImpl <em>EEF Ext Editable Reference Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFExtEditableReferenceDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFExtEditableReferenceDescription()
* @generated
@@ -411,7 +376,6 @@
* The meta object literal for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl <em>EEF Container Border Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFContainerBorderDescription()
* @generated
@@ -422,7 +386,6 @@
* The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
EAttribute EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getEEFContainerBorderDescription_LabelExpression();
@@ -431,7 +394,6 @@
* The meta object literal for the '{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFLanguageExpressionDescriptionImpl <em>EEF Language Expression Description</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFLanguageExpressionDescriptionImpl
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EefAdvancedControlsPackageImpl#getEEFLanguageExpressionDescription()
* @generated
@@ -440,4 +402,4 @@
}
-} // EefAdvancedControlsPackage
+} //EefAdvancedControlsPackage
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java
similarity index 80%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java
index f9c21b8..f995b45 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFContainerBorderDescriptionImpl.java
@@ -14,8 +14,11 @@
package org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl;
import org.eclipse.eef.impl.EEFContainerDescriptionImpl;
+
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EefAdvancedControlsPackage;
@@ -28,7 +31,7 @@
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl.EEFContainerBorderDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
* </ul>
*
* @generated
@@ -38,7 +41,6 @@
* The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getLabelExpression()
* @generated
* @ordered
@@ -49,7 +51,6 @@
* The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getLabelExpression()
* @generated
* @ordered
@@ -59,7 +60,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected EEFContainerBorderDescriptionImpl() {
@@ -69,7 +69,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -80,7 +79,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public String getLabelExpression() {
@@ -90,7 +88,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public void setLabelExpression(String newLabelExpression) {
@@ -103,14 +100,13 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
- return getLabelExpression();
+ case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
+ return getLabelExpression();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -118,15 +114,14 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
- setLabelExpression((String) newValue);
- return;
+ case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
+ setLabelExpression((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -134,15 +129,14 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
- setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
- return;
+ case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
+ setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -150,14 +144,13 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
- return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+ case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION__LABEL_EXPRESSION:
+ return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
}
return super.eIsSet(featureID);
}
@@ -165,13 +158,11 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
- return super.toString();
+ if (eIsProxy()) return super.toString();
StringBuilder result = new StringBuilder(super.toString());
result.append(" (labelExpression: "); //$NON-NLS-1$
@@ -180,4 +171,4 @@
return result.toString();
}
-} // EEFContainerBorderDescriptionImpl
+} //EEFContainerBorderDescriptionImpl
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFExtEditableReferenceDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFExtEditableReferenceDescriptionImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFExtEditableReferenceDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFExtEditableReferenceDescriptionImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFLanguageExpressionDescriptionImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFLanguageExpressionDescriptionImpl.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFLanguageExpressionDescriptionImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EEFLanguageExpressionDescriptionImpl.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java
similarity index 71%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java
index 36a9cc6..25bcdcb 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsFactoryImpl.java
@@ -16,19 +16,16 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription;
-import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription;
-import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFLanguageExpressionDescription;
-import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EefAdvancedControlsFactory;
-import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EefAdvancedControlsPackage;
+import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.*;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- *
* @generated
*/
public class EefAdvancedControlsFactoryImpl extends EFactoryImpl implements EefAdvancedControlsFactory {
@@ -36,16 +33,16 @@
* Creates the default factory implementation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static EefAdvancedControlsFactory init() {
try {
- EefAdvancedControlsFactory theEefAdvancedControlsFactory = (EefAdvancedControlsFactory) EPackage.Registry.INSTANCE.getEFactory(EefAdvancedControlsPackage.eNS_URI);
+ EefAdvancedControlsFactory theEefAdvancedControlsFactory = (EefAdvancedControlsFactory)EPackage.Registry.INSTANCE.getEFactory(EefAdvancedControlsPackage.eNS_URI);
if (theEefAdvancedControlsFactory != null) {
return theEefAdvancedControlsFactory;
}
- } catch (Exception exception) {
+ }
+ catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new EefAdvancedControlsFactoryImpl();
@@ -55,7 +52,6 @@
* Creates an instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EefAdvancedControlsFactoryImpl() {
@@ -65,27 +61,22 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
- case EefAdvancedControlsPackage.EEF_EXT_EDITABLE_REFERENCE_DESCRIPTION:
- return createEEFExtEditableReferenceDescription();
- case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION:
- return createEEFContainerBorderDescription();
- case EefAdvancedControlsPackage.EEF_LANGUAGE_EXPRESSION_DESCRIPTION:
- return createEEFLanguageExpressionDescription();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ case EefAdvancedControlsPackage.EEF_EXT_EDITABLE_REFERENCE_DESCRIPTION: return createEEFExtEditableReferenceDescription();
+ case EefAdvancedControlsPackage.EEF_CONTAINER_BORDER_DESCRIPTION: return createEEFContainerBorderDescription();
+ case EefAdvancedControlsPackage.EEF_LANGUAGE_EXPRESSION_DESCRIPTION: return createEEFLanguageExpressionDescription();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EEFExtEditableReferenceDescription createEEFExtEditableReferenceDescription() {
@@ -96,7 +87,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EEFContainerBorderDescription createEEFContainerBorderDescription() {
@@ -107,7 +97,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EEFLanguageExpressionDescription createEEFLanguageExpressionDescription() {
@@ -118,17 +107,15 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EefAdvancedControlsPackage getEefAdvancedControlsPackage() {
- return (EefAdvancedControlsPackage) getEPackage();
+ return (EefAdvancedControlsPackage)getEPackage();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
@@ -137,4 +124,4 @@
return EefAdvancedControlsPackage.eINSTANCE;
}
-} // EefAdvancedControlsFactoryImpl
+} //EefAdvancedControlsFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java
similarity index 85%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java
index 92678b8..850c8ac 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/impl/EefAdvancedControlsPackageImpl.java
@@ -14,11 +14,14 @@
package org.eclipse.papyrus.sirius.properties.eef.advanced.controls.impl;
import org.eclipse.eef.EefPackage;
+
import org.eclipse.eef.ext.widgets.reference.eefextwidgetsreference.EefExtWidgetsReferencePackage;
+
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcorePackage;
+
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFContainerBorderDescription;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription;
@@ -30,14 +33,12 @@
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- *
* @generated
*/
public class EefAdvancedControlsPackageImpl extends EPackageImpl implements EefAdvancedControlsPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private EClass eefExtEditableReferenceDescriptionEClass = null;
@@ -45,7 +46,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private EClass eefContainerBorderDescriptionEClass = null;
@@ -53,7 +53,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private EClass eefLanguageExpressionDescriptionEClass = null;
@@ -62,14 +61,12 @@
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
- * <p>
- * Note: the correct way to create the package is via the static
+ * <p>Note: the correct way to create the package is via the static
* factory method {@link #init init()}, which also performs
* initialization of the package, or returns the registered package,
* if one already exists.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EefAdvancedControlsPackage#eNS_URI
* @see #init()
@@ -82,7 +79,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private static boolean isInited = false;
@@ -90,25 +86,21 @@
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
- * <p>
- * This method is used to initialize {@link EefAdvancedControlsPackage#eINSTANCE} when that field is accessed.
+ * <p>This method is used to initialize {@link EefAdvancedControlsPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
* @generated
*/
public static EefAdvancedControlsPackage init() {
- if (isInited)
- return (EefAdvancedControlsPackage) EPackage.Registry.INSTANCE.getEPackage(EefAdvancedControlsPackage.eNS_URI);
+ if (isInited) return (EefAdvancedControlsPackage)EPackage.Registry.INSTANCE.getEPackage(EefAdvancedControlsPackage.eNS_URI);
// Obtain or create and register package
Object registeredEefAdvancedControlsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
- EefAdvancedControlsPackageImpl theEefAdvancedControlsPackage = registeredEefAdvancedControlsPackage instanceof EefAdvancedControlsPackageImpl ? (EefAdvancedControlsPackageImpl) registeredEefAdvancedControlsPackage
- : new EefAdvancedControlsPackageImpl();
+ EefAdvancedControlsPackageImpl theEefAdvancedControlsPackage = registeredEefAdvancedControlsPackage instanceof EefAdvancedControlsPackageImpl ? (EefAdvancedControlsPackageImpl)registeredEefAdvancedControlsPackage : new EefAdvancedControlsPackageImpl();
isInited = true;
@@ -134,7 +126,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EClass getEEFExtEditableReferenceDescription() {
@@ -144,7 +135,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EClass getEEFContainerBorderDescription() {
@@ -154,17 +144,15 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getEEFContainerBorderDescription_LabelExpression() {
- return (EAttribute) eefContainerBorderDescriptionEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)eefContainerBorderDescriptionEClass.getEStructuralFeatures().get(0);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EClass getEEFLanguageExpressionDescription() {
@@ -174,32 +162,28 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EefAdvancedControlsFactory getEefAdvancedControlsFactory() {
- return (EefAdvancedControlsFactory) getEFactoryInstance();
+ return (EefAdvancedControlsFactory)getEFactoryInstance();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is
+ * Creates the meta-model objects for the package. This method is
* guarded to have no affect on any invocation but its first.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public void createPackageContents() {
- if (isCreated)
- return;
+ if (isCreated) return;
isCreated = true;
// Create classes and their features
@@ -214,22 +198,19 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This
+ * Complete the initialization of the package and its meta-model. This
* method is guarded to have no affect on any invocation but its first.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public void initializePackageContents() {
- if (isInitialized)
- return;
+ if (isInitialized) return;
isInitialized = true;
// Initialize package
@@ -238,9 +219,9 @@
setNsURI(eNS_URI);
// Obtain other dependent packages
- EefExtWidgetsReferencePackage theEefExtWidgetsReferencePackage = (EefExtWidgetsReferencePackage) EPackage.Registry.INSTANCE.getEPackage(EefExtWidgetsReferencePackage.eNS_URI);
- EefPackage theEefPackage = (EefPackage) EPackage.Registry.INSTANCE.getEPackage(EefPackage.eNS_URI);
- EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ EefExtWidgetsReferencePackage theEefExtWidgetsReferencePackage = (EefExtWidgetsReferencePackage)EPackage.Registry.INSTANCE.getEPackage(EefExtWidgetsReferencePackage.eNS_URI);
+ EefPackage theEefPackage = (EefPackage)EPackage.Registry.INSTANCE.getEPackage(EefPackage.eNS_URI);
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
// Create type parameters
@@ -256,8 +237,7 @@
initEClass(eefExtEditableReferenceDescriptionEClass, EEFExtEditableReferenceDescription.class, "EEFExtEditableReferenceDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEClass(eefContainerBorderDescriptionEClass, EEFContainerBorderDescription.class, "EEFContainerBorderDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getEEFContainerBorderDescription_LabelExpression(), theEcorePackage.getEString(), "labelExpression", null, 0, 1, EEFContainerBorderDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$
- !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEEFContainerBorderDescription_LabelExpression(), theEcorePackage.getEString(), "labelExpression", null, 0, 1, EEFContainerBorderDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(eefLanguageExpressionDescriptionEClass, EEFLanguageExpressionDescription.class, "EEFLanguageExpressionDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -265,4 +245,4 @@
createResource(eNS_URI);
}
-} // EefAdvancedControlsPackageImpl
+} //EefAdvancedControlsPackageImpl
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsAdapterFactory.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsAdapterFactory.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsAdapterFactory.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsAdapterFactory.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsSwitch.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsSwitch.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsSwitch.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/advanced/controls/util/EefAdvancedControlsSwitch.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
similarity index 96%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
index 771a53a..31fa01f 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
org.eclipse.eef.ext.widgets.reference;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sirius.properties.advanced.controls;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.properties.advanced.controls;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.properties.eef.advanced.controls;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.common.interpreter;bundle-version="[7.0.2,8.0.0)",
org.eclipse.sirius.properties;bundle-version="[7.0.2,8.0.0)",
- org.eclipse.sirius.properties.core;bundle-version="[7.0.2,8.0.0)",
+ org.eclipse.sirius.properties.core;bundle-version="[7.0.2,8.0.0)",
org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[7.0.2,8.0.0)"
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml
similarity index 98%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml
index 749d360..259679f 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/plugin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
Copyright (c) 2022 CEA, Obeo
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml
index dec845e..98583d8 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionConverter.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionConverter.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionConverter.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionConverter.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionPreprocessor.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionPreprocessor.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionPreprocessor.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ContainerBorderDescriptionPreprocessor.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionConverter.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionConverter.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionConverter.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionConverter.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionPreprocessor.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionPreprocessor.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionPreprocessor.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/ExtEditableReferenceDescriptionPreprocessor.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionConverter.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionConverter.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionConverter.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionConverter.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionPreprocessor.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionPreprocessor.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionPreprocessor.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/ui/advanced/controls/internal/LanguageExpressionDescriptionPreprocessor.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.project
similarity index 87%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.project
index 743dedc..baa693e 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.project
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls</name>
+ <name>org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF
similarity index 78%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF
index 6e5104a..4d39ea3 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls;singleton:=true
Bundle-Version: 0.7.0.qualifier
Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)",
+Bundle-Activator: org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.Activator
+Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.eef;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.eef.core;bundle-version="[2.0.0,3.0.0)",
org.eclipse.eef.common;bundle-version="[2.0.0,3.0.0)",
org.eclipse.eef.common.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.eef.core;bundle-version="[2.0.0,3.0.0)",
org.eclipse.eef.core.ext.widgets.reference;bundle-version="[2.0.0,3.0.0)",
org.eclipse.eef.ext.widgets.reference;bundle-version="[2.0.0,3.0.0)",
org.eclipse.eef.ide.ui;bundle-version="[2.0.0,3.0.0)",
@@ -20,8 +20,8 @@
org.eclipse.emf.edit.ui;bundle-version="[2.21.0,3.0.0)",
org.eclipse.papyrus.infra.properties.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.papyrus.sirius.properties.uml;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.properties.eef.advanced.controls;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.properties.uml;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.properties;bundle-version="[4.0.0,5.0.0)",
org.eclipse.sirius.common.interpreter;bundle-version="[7.0.2,8.0.0)",
org.eclipse.ui;bundle-version="[3.201.0,4.0.0)",
@@ -29,6 +29,6 @@
org.eclipse.ui.workbench;bundle-version="[3.125.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls
+Automatic-Module-Name: org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/icons/Edit_16x16.gif b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/icons/Edit_16x16.gif
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/icons/Edit_16x16.gif
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/icons/Edit_16x16.gif
Binary files differ
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/icons/license.txt b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/icons/license.txt
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/icons/license.txt
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/icons/license.txt
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/plugin.xml
similarity index 69%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/plugin.xml
index 28293a4..06ed866 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/plugin.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/plugin.xml
@@ -20,7 +20,7 @@
<extension
point="org.eclipse.eef.ide.ui.eefLifecycleManagerProvider">
<descriptor
- class="org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal.EditableReferenceLifecycleManagerProvider"
+ class="org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal.EditableReferenceLifecycleManagerProvider"
description="%editableReferenceLifecycleManagerProvider.Description"
id="org.eclipse.papyrus.sirius.properties.advanced.controls.EditableReferenceLifecycleManagerProvider"
label="%editableReferenceLifecycleManagerProvider.Name">
@@ -29,7 +29,7 @@
<extension
point="org.eclipse.eef.ide.ui.eefLifecycleManagerProvider">
<descriptor
- class="org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.containerborder.internal.ContainerBorderLifecycleManagerProvider"
+ class="org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.containerborder.internal.ContainerBorderLifecycleManagerProvider"
description="%containerBorderLifecycleManagerProvider.Description"
id="org.eclipse.papyrus.sirius.properties.advanced.controls.ContainerBorderLifecycleManagerProvider"
label="%containerBorderLifecycleManagerProvider.Name">
@@ -38,9 +38,9 @@
<extension
point="org.eclipse.eef.ide.ui.eefLifecycleManagerProvider">
<descriptor
- class="org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.languageexpression.internal.LanguageExpressionLifecycleManagerProvider"
+ class="org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.languageexpression.internal.LanguageExpressionLifecycleManagerProvider"
description="description"
- id="org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.languageexpression.LanguageExpressionLifecycleManagerProvider"
+ id="org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.languageexpression.LanguageExpressionLifecycleManagerProvider"
label="label">
</descriptor>
</extension>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/pom.xml
similarity index 64%
copy from plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
copy to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/pom.xml
index 819c4e8..d6a1ee5 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/pom.xml
@@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls</artifactId>
+ <artifactId>org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/Activator.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/Activator.java
similarity index 95%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/Activator.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/Activator.java
index 71f0cc0..a664dce 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/Activator.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/Activator.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@@ -29,7 +29,7 @@
/**
* The plug-in ID.
*/
- public static final String PLUGIN_ID = "org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls"; //$NON-NLS-1$
/**
* The name of the icon Edit_16x16.gif.
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java
similarity index 96%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java
index cc66334..f8d8eff 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManager.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.containerborder.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.containerborder.internal;
import org.eclipse.eef.core.api.EditingContextAdapter;
import org.eclipse.eef.ide.ui.internal.widgets.EEFContainerLifecycleManager;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java
similarity index 94%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java
index 31453fa..e10d919 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/containerborder/internal/ContainerBorderLifecycleManagerProvider.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.containerborder.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.containerborder.internal;
import org.eclipse.eef.EEFControlDescription;
import org.eclipse.eef.core.api.EditingContextAdapter;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java
similarity index 94%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java
index 314f39a..4b8c488 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/ContainerUtil.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.util.List;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java
similarity index 97%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java
index 89ddefc..86e92af 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceController.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.util.ArrayList;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java
similarity index 97%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java
index d9951a4..35ed46b 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/EditableReferenceLifecycleManagerProvider.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.util.Collection;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java
similarity index 97%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java
index b87b2ff..6d571d0 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/MultipleEditableReferenceLifecycleManager.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +32,7 @@
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription;
-import org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.Activator;
+import org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.Activator;
import org.eclipse.sirius.common.interpreter.api.IInterpreter;
import org.eclipse.sirius.common.interpreter.api.IVariableManager;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java
similarity index 96%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java
index 41e6a7a..d239403 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationPage.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java
similarity index 95%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java
index a31e7d6..e6d4cf9 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/PapyrusEEFExtEObjectCreationWizard.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.lang.reflect.InvocationTargetException;
@@ -24,8 +24,8 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.Activator;
import org.eclipse.papyrus.sirius.properties.uml.dialog.PropertiesUtils;
+import org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.Activator;
import org.eclipse.sirius.common.interpreter.api.IInterpreter;
import org.eclipse.sirius.common.interpreter.api.IVariableManager;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java
similarity index 97%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java
index 43e3bed..a4ae6db 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/editablereference/internal/SingleEditableReferenceLifecycleManager.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.editablereference.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.editablereference.internal;
import java.util.List;
@@ -26,7 +26,7 @@
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFExtEditableReferenceDescription;
-import org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.Activator;
+import org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.Activator;
import org.eclipse.sirius.common.interpreter.api.IInterpreter;
import org.eclipse.sirius.common.interpreter.api.IVariableManager;
import org.eclipse.swt.SWT;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java
similarity index 94%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java
index 816f615..4184ae4 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionController.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.languageexpression.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.languageexpression.internal;
import org.eclipse.eef.core.api.EditingContextAdapter;
import org.eclipse.eef.core.api.controllers.AbstractEEFWidgetController;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java
similarity index 98%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java
index fd89c64..493545a 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManager.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.languageexpression.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.languageexpression.internal;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +42,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.sirius.properties.eef.advanced.controls.EEFLanguageExpressionDescription;
-import org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.Activator;
+import org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.Activator;
import org.eclipse.papyrus.uml.properties.expression.ExpressionList.Expression;
import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;
import org.eclipse.papyrus.uml.properties.preferences.LanguageRegistry;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java
similarity index 95%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java
index bdfc84a..7d93128 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls/src/org/eclipse/papyrus/sirius/properties/uml/eef/ide/ui/advanced/controls/languageexpression/internal/LanguageExpressionLifecycleManagerProvider.java
@@ -11,7 +11,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls.languageexpression.internal;
+package org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls.languageexpression.internal;
import org.eclipse.eef.EEFControlDescription;
import org.eclipse.eef.core.api.EEFExpressionUtils;
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.classpath
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.classpath
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.project b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.project
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.project
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.project
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.resources.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.resources.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.runtime.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.runtime.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.core.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.core.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.ui.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.api.tools.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.prefs b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.prefs
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/.settings/org.eclipse.pde.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/META-INF/MANIFEST.MF
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/META-INF/MANIFEST.MF
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/about.html b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/about.html
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/about.html
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/about.html
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/build.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/build.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/build.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/build.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign
similarity index 99%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign
index 297c273..2ada401 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/description/umlProperties.odesign
@@ -13,7 +13,6 @@
<entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstraintColor"/>
</userColorsPalettes>
<extensions xsi:type="properties:ViewExtensionDescription" name="sirius_rules_properties">
- <metamodels href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
<categories name="Default">
<pages name="abstraction_uml_page" labelExpression="aql:'UML'" domainClass="uml::Abstraction" semanticCandidateExpression="aql:input.getSemanticElement()" preconditionExpression="aql:not(self.oclIsKindOf(uml::Realization)) and not(self.oclIsKindOf(uml::Manifestation))" groups="//@extensions.0/@categories.0/@groups.0"/>
<pages name="acceptCallAction_uml_page" labelExpression="aql:'UML'" domainClass="uml::AcceptCallAction" semanticCandidateExpression="aql:input.getSemanticElement()" groups="//@extensions.0/@categories.0/@groups.1"/>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/plugin.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/plugin.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/plugin.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/plugin.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/plugin.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/plugin.xml
similarity index 98%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/plugin.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/plugin.xml
index 0faa884..45c631d 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/plugin.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/plugin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
Copyright (c) 2022 CEA, Obeo
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/pom.xml b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/pom.xml
similarity index 77%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/pom.xml
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/pom.xml
index bee4c22..144fe05 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/pom.xml
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/Activator.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/Activator.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/Activator.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/Activator.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesFormDialog.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesFormDialog.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesFormDialog.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesFormDialog.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesUtils.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesUtils.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesUtils.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/dialog/PropertiesUtils.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/Messages.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/Messages.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/Messages.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/Messages.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/messages.properties b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/messages.properties
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/messages.properties
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/messages/messages.properties
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferenceInitializer.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferenceInitializer.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferenceInitializer.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferenceInitializer.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferencePage.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferencePage.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferencePage.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/preferences/EEFPreferencePage.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/PropertiesServices.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/PropertiesServices.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/PropertiesServices.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/PropertiesServices.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/UMLDocumentationResource.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/UMLDocumentationResource.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/UMLDocumentationResource.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/services/UMLDocumentationResource.java
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/view/CustomSiriusContributorWrapper.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/view/CustomSiriusContributorWrapper.java
similarity index 100%
rename from plugins/uml/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/view/CustomSiriusContributorWrapper.java
rename to plugins/properties/org.eclipse.papyrus.sirius.properties.uml/src/org/eclipse/papyrus/sirius/properties/uml/view/CustomSiriusContributorWrapper.java
diff --git a/plugins/properties/pom.xml b/plugins/properties/pom.xml
new file mode 100644
index 0000000..ef8f6bf
--- /dev/null
+++ b/plugins/properties/pom.xml
@@ -0,0 +1,30 @@
+<?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.sirius-plugins</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.papyrus.sirius.plugins-properties</groupId>
+ <artifactId>org.eclipse.papyrus.sirius.plugins.properties</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Papyrus-Sirius Properties Plugins</name>
+ <description>Container of the Papyrus-Sirius Properties Plugins</description>
+
+ <modules>
+ <module>org.eclipse.papyrus.sirius.properties.uml</module>
+ <module>org.eclipse.papyrus.sirius.properties.eef.advanced.controls</module>
+ <module>org.eclipse.papyrus.sirius.properties.uml.eef.ide.ui.advanced.controls</module>
+ <module>org.eclipse.papyrus.sirius.properties.advanced.controls</module>
+ <module>org.eclipse.papyrus.sirius.properties.advanced.controls.edit</module>
+ <module>org.eclipse.papyrus.sirius.properties.ui.advanced.controls</module>
+ <module>org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls</module>
+ </modules>
+</project>
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/pom.xml b/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/pom.xml
deleted file mode 100644
index 44e98f7..0000000
--- a/plugins/uml/org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls/pom.xml
+++ /dev/null
@@ -1,16 +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.sirius.plugins-uml</groupId>
- <artifactId>org.eclipse.papyrus.sirius.plugins.uml</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/uml/pom.xml b/plugins/uml/pom.xml
index be8abf4..74299e9 100755
--- a/plugins/uml/pom.xml
+++ b/plugins/uml/pom.xml
@@ -26,12 +26,5 @@
<module>org.eclipse.papyrus.sirius.uml.diagram.sequence</module>
<module>org.eclipse.papyrus.sirius.uml.diagram.statemachine</module>
<module>org.eclipse.papyrus.sirius.uml.diagram.textedit</module>
- <module>org.eclipse.papyrus.sirius.properties.uml</module>
- <module>org.eclipse.papyrus.sirius.properties.eef.advanced.controls</module>
- <module>org.eclipse.papyrus.sirius.properties.eef.ide.ui.advanced.controls</module>
- <module>org.eclipse.papyrus.sirius.properties.advanced.controls</module>
- <module>org.eclipse.papyrus.sirius.properties.advanced.controls.edit</module>
- <module>org.eclipse.papyrus.sirius.properties.ui.advanced.controls</module>
- <module>org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls</module>
</modules>
</project>
