386118: [EMF Facet] Papyrus should progressively support EMF Facet 0.2

https://bugs.eclipse.org/bugs/show_bug.cgi?id=386118

84 files changed, 31 insertions, 8 deletions

diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/META-INF/MANIFEST.MF
index 69a3a4b1d55..3f6e6642de7 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/META-INF/MANIFEST.MF
@@ -96,4 +96,5 @@ SHA1-Digest: jBVSn/vyk1D+ENgZXtuTq70lQlM=
 

 Name: img/bottomMiddleOverlay.png

 SHA1-Digest: KW+VnZzQw+o1q1QXrXgXNv+78fc=

+Bundle-Activator: activator

 

diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/src/org/eclipse/emf/facet/custom/doc/Activator.java b/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/src/org/eclipse/emf/facet/custom/doc/Activator.java
new file mode 100644
index 00000000000..82c63a6e4cd
--- /dev/null
+++ b/plugins/facet/editor/org.eclipse.emf.facet.custom.doc/src/org/eclipse/emf/facet/custom/doc/Activator.java
@@ -0,0 +1,17 @@
+package org.eclipse.emf.facet.custom.doc;

+

+import org.osgi.framework.BundleActivator;

+import org.osgi.framework.BundleContext;

+

+public class Activator implements BundleActivator {

+

+	@Override

+	public void start(BundleContext context) throws Exception {

+		// TODO Auto-generated method stub

+	}

+

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		// TODO Auto-generated method stub

+	}

+}

diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
index 4f8b046a099..864515ec2c3 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
+++ b/plugins/facet/editor/org.eclipse.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.emf.facet.custom.sdk.ui,

  org.eclipse.papyrus.emf.facet.custom.ui,

  org.eclipse.papyrus.emf.facet.query.java.core,

- org.eclipse.papyrus.emf.facet.query.java.metamodel

+ org.eclipse.papyrus.emf.facet.query.java.metamodel,

+ org.eclipse.papyrus.emf.facet.query.ocl.metamodel

 Bundle-Version: 0.4.0.201308190853

 Bundle-ClassPath: .

 Build-Jdk: 1.6.0_27

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
index 0ee736edfb8..31cdf568bf6 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="0.2.0";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.core;bundle-version="0.2.0",
  org.eclipse.emf.edit;bundle-version="2.6.0",
- org.eclipse.emf.validation;bundle-version="1.4.0"
+ org.eclipse.emf.validation;bundle-version="1.4.0",
+ org.eclipse.papyrus.emf.facet.efacet.metamodel
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.facet.custom.core,
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/plugin.xml
index 5dc1df74eba..33c2026a858 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/plugin.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/plugin.xml
@@ -28,13 +28,13 @@ Contributors:
       </catalog>

    </extension>

    

-    <extension point="org.eclipse.emf.facet.efacet.core.derivedTypedElementImplementationRegistration">

+    <extension point="org.eclipse.papyrus.emf.facet.efacet.core.derivedTypedElementImplementationRegistration">

       <derivedTypedElementImplementationRegistration

             class="org.eclipse.emf.facet.custom.core.internal.query.ETypedElementSwitchQueryImplementationFactory">

       </derivedTypedElementImplementationRegistration>

 	</extension>

 

-   <extension point="org.eclipse.emf.facet.efacet.core.queryImplementationRegistration">

+   <extension point="org.eclipse.papyrus.emf.facet.efacet.core.queryImplementationRegistration">

       <queryImplementationRegistration class="org.eclipse.emf.facet.custom.core.internal.query.SwitchQueryImplementationFactory"/>

    </extension>

 </plugin>

diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.classpath
index da1049abda9..da1049abda9 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.classpath
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.classpath
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.project b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project
index e329e952c1d..e329e952c1d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.project
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.project
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
index dafbb140e95..dafbb140e95 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/eclipse.inf b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/eclipse.inf
index 92ffed2421c..92ffed2421c 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/eclipse.inf
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/eclipse.inf
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.properties
index 13321a40eb7..13321a40eb7 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.properties
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.xml
index 364e008ce56..364e008ce56 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/maven/org.eclipse.emft/org.eclipse.emf.facet.custom.sdk.ui/pom.xml
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
index 71af665ad77..71af665ad77 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/about.html b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/about.html
index 3019b95b9cf..3019b95b9cf 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/about.html
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/about.html
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties
index 409a846ccc5..409a846ccc5 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetAttribute.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetAttribute.gif
index 78d42474957..78d42474957 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetAttribute.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetAttribute.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetOperation.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetOperation.gif
index b3643da048a..b3643da048a 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetOperation.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetOperation.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetReference.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetReference.gif
index 0c9154c7997..0c9154c7997 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetReference.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetReference.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetSet.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetSet.gif
index d8a3e957c58..d8a3e957c58 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/FacetSet.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/FacetSet.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/ParameterValue.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/ParameterValue.gif
index 2b692560297..2b692560297 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/ParameterValue.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/ParameterValue.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/facet.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/facet.gif
index 8c67c03cc10..8c67c03cc10 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/facet.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/facet.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/flatView.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/flatView.gif
index 1ef74cf98f4..1ef74cf98f4 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/flatView.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/flatView.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/full/obj16/CustomModelFile.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/full/obj16/CustomModelFile.gif
index 8a7eeb2c824..8a7eeb2c824 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/full/obj16/CustomModelFile.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/full/obj16/CustomModelFile.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/full/wizban/NewCustom.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/full/wizban/NewCustom.gif
index eab53a99e8c..eab53a99e8c 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/full/wizban/NewCustom.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/full/wizban/NewCustom.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/querySet.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/querySet.gif
index 07d18c55b7f..07d18c55b7f 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/querySet.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/querySet.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/treeView.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/treeView.gif
index 234486172ca..234486172ca 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/icons/treeView.gif
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/icons/treeView.gif
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/org.eclipse.emf.facet.custom.sdk.ui.modelcelleditors b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/org.eclipse.emf.facet.custom.sdk.ui.modelcelleditors
index d5bb2ed5a38..d5bb2ed5a38 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/org.eclipse.emf.facet.custom.sdk.ui.modelcelleditors
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/org.eclipse.emf.facet.custom.sdk.ui.modelcelleditors
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml
index 17b904786e6..aae098cee8d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/plugin.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/plugin.xml
@@ -13,10 +13,10 @@
        Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors

 -->

 <plugin>

-   <extension point="org.eclipse.emf.facet.widgets.celleditors.celleditors">

+   <extension point="org.eclipse.papyrus.emf.facet.widgets.celleditors.celleditors">

       <cellEditorsModel path="org.eclipse.emf.facet.custom.sdk.ui.modelcelleditors"/>

    </extension>

-   <extension point="org.eclipse.emf.facet.widgets.celleditors.compositeEditorFactories">

+   <extension point="org.eclipse.papyrus.emf.facet.widgets.celleditors.compositeEditorFactories">

       <compositeEditorFactory class="org.eclipse.emf.facet.custom.sdk.ui.internal.widgets.celleditors.composite.ImageCompositeFactory"/>

    </extension>

    <extension

diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/dialog/ICustomizationDialogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/dialog/ICustomizationDialogFactory.java
index e5238c9efea..e5238c9efea 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/dialog/ICustomizationDialogFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/dialog/ICustomizationDialogFactory.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Activator.java
index 2bc1e3a305d..2bc1e3a305d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Activator.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Activator.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Messages.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Messages.java
index c0c69168c5b..c0c69168c5b 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Messages.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Messages.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Startup.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Startup.java
index ba68f279d71..ba68f279d71 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Startup.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/Startup.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
index ec045f2cd45..ec045f2cd45 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/dialog/CustomizationDialogFactory.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/messages.properties
index 7dc535d839c..7dc535d839c 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/messages.properties
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/sync/SynchronizedGetOrCreateFilteredElementCommmandWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/sync/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
index 0c0b4d15550..0c0b4d15550 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/sync/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/sync/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractCustomizationMainDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractCustomizationMainDialog.java
index 553c7456f96..553c7456f96 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractCustomizationMainDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractCustomizationMainDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetCustomizationDialog.java
index 1e21922c904..1e21922c904 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetOrCreateCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetOrCreateCustomizationDialog.java
index 416620b3360..416620b3360 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetOrCreateCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/AbstractGetOrCreateCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
index ff94ff0d60b..ff94ff0d60b 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCaseQueryDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
index f4ac0ab5144..f4ac0ab5144 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/AddCustomizationPropertyDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
index c444cbef1e6..c444cbef1e6 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateEClassCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
index 84fa5cd1f14..84fa5cd1f14 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/CreateFacetCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
index 5fe973b3ef2..5fe973b3ef2 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/command/QueryContext.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
index 843703a54ae..843703a54ae 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/getorcreate/GetOrCreateCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetCustomizedFacetDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetCustomizedFacetDialog.java
index c7916a8fa9d..c7916a8fa9d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetCustomizedFacetDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetCustomizedFacetDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetExtendedFacetDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetExtendedFacetDialog.java
index ba52524eefc..ba52524eefc 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetExtendedFacetDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetExtendedFacetDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetFacetOperationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetFacetOperationDialog.java
index a555c0cb1b0..a555c0cb1b0 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetFacetOperationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/selection/GetFacetOperationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCaseQueryDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCaseQueryDialog.java
index cff43749e2f..cff43749e2f 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCaseQueryDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCaseQueryDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCustomizationPropertyDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCustomizationPropertyDialog.java
index a74ee8f0055..a74ee8f0055 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCustomizationPropertyDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedAddCustomizationPropertyDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateEClassCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateEClassCustomizationDialog.java
index 0f2045248e0..0f2045248e0 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateEClassCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateEClassCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateFacetCustomizationDialog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateFacetCustomizationDialog.java
index 78d00ef2212..78d00ef2212 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateFacetCustomizationDialog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/dialog/sync/SynchronizedCreateFacetCustomizationDialog.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
index 2d13a725f19..2d13a725f19 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCaseQueryHandler.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
index f97b89bdfc6..f97b89bdfc6 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInEClassHandler.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
index 7c43859457d..7c43859457d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/AddCustomizationPropertyInFacetHandler.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
index 36f435cb8b4..36f435cb8b4 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateEClassCustomizationHandler.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
index a87a1fed4d8..a87a1fed4d8 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/CreateFacetCustomizationHandler.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/Utils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/Utils.java
index b9ff5caaaae..b9ff5caaaae 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/Utils.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/handler/Utils.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
index cdf492f7b93..cdf492f7b93 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCaseQueryWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
index c4c56104d0c..c4c56104d0c 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/AddCustomizationPropertyWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
index 50be1908a1a..50be1908a1a 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateEClassCustomizationWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
index abafe7d52c3..abafe7d52c3 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/CreateFacetCustomizationWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
index a3c71be2488..a3c71be2488 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/command/GetOrCreateCustomizationWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/AbstractGetFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/AbstractGetFacetWidget.java
index 9cb70248708..9cb70248708 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/AbstractGetFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/AbstractGetFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetCustomizedFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetCustomizedFacetWidget.java
index fc24dca02fd..fc24dca02fd 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetCustomizedFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetCustomizedFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetExtendedFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetExtendedFacetWidget.java
index 7f6e6df2627..7f6e6df2627 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetExtendedFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetExtendedFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredCustomizedFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredCustomizedFacetWidget.java
index 695550d8c44..695550d8c44 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredCustomizedFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredCustomizedFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
index 8437e1bcf30..8437e1bcf30 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredExtendedFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredOperationFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredOperationFacetWidget.java
index 4f53aa92a12..4f53aa92a12 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredOperationFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetFiltredOperationFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOperationFacetWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOperationFacetWidget.java
index 21281202f3d..21281202f3d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOperationFacetWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOperationFacetWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
index fd35bfbae67..fd35bfbae67 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/getorcreate/GetOrCreateCustomizationWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/metaclass/GetExtendedMetaclassWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/metaclass/GetExtendedMetaclassWidget.java
index 394b7c96a01..394b7c96a01 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/metaclass/GetExtendedMetaclassWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/metaclass/GetExtendedMetaclassWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
index b8d14635b71..b8d14635b71 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryNameWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryTypeWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryTypeWidget.java
index cb986c391f1..cb986c391f1 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryTypeWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetCaseQueryTypeWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetEClassCustomizationNameWidget.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetEClassCustomizationNameWidget.java
index 2f3e18797f0..2f3e18797f0 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetEClassCustomizationNameWidget.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/widget/property/name/GetEClassCustomizationNameWidget.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
index 0ba18a5643a..0ba18a5643a 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/CreateCustimizationWizardImpl.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
index 16ab5c56684..16ab5c56684 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CreateCustomizationWizardPage.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
index 15cdbca2d03..15cdbca2d03 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/util/wizard/page/CustomPropertyWizardPage.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
index 9fcb9afb558..9fcb9afb558 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/ImageCellEditor.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
index 2fe468708c0..2fe468708c0 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageComposite.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
index e4035c6e05d..e4035c6e05d 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/widgets/celleditors/composite/ImageCompositeFactory.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
index 7e5fc03bd2a..7e5fc03bd2a 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICreateCustomizationWizardPage.java
diff --git a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICustomizationPropertyWizardPage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICustomizationPropertyWizardPage.java
index e06ba2dbe00..e06ba2dbe00 100644
--- a/plugins/facet/editor/org.eclipse.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICustomizationPropertyWizardPage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/emf/facet/custom/sdk/ui/internal/wizard/page/ICustomizationPropertyWizardPage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
index 45f024e850e..2d1a4302f04 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
index b3c3a4c70e9..43dd1c17d85 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
@@ -19,9 +19,12 @@ Export-Package: org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet,
  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.impl,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.util,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime,

+ org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.impl,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.util,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization,

+ org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.impl,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.util,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.util,

  org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog,

- org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl

+ org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl,

+ org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.util