Merge remote-tracking branch 'origin/master' intobugs/441962-multipleXTextEditorsForUMLElements

bugs/441962-multipleXTextEditorsForUMLElements

Change-Id: I6d01c30bcfaa6169bec19e81ee31dfd2839f83c5
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>

22 files changed, 855 insertions, 319 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
index ffe9402c666..f71c2d7856d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.uml2.uml.Behavior;
-import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Dependency;
@@ -56,14 +55,14 @@ public class GenUtils {
 	public static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
 
 	/**
-	 * Retrieve template bindings for the class passed as a Parameter
-	 * only one template binding can exist for an element
+	 * Retrieve first template binding from list of template bindings, if
+	 * exactly one exists. Return null otherwise.
 	 *
 	 * @param current
 	 *            Class on which the template binding is searched
 	 * @return the template binding of current Class
 	 */
-	public static TemplateBinding getTemplateBindings(Class current) {
+	public static TemplateBinding getTemplateBinding(Classifier current) {
 		TemplateBinding binding = null;
 		if (current.getTemplateBindings().size() == 1) {
 			binding = current.getTemplateBindings().get(0);
@@ -382,8 +381,9 @@ public class GenUtils {
 	 * Is a certain stereotype applied?
 	 *
 	 * @param element
+	 *            a UML element
 	 * @param stereotype
-	 *            fully qualified stereotype name
+	 *            The class of an element of a static profile
 	 * @return
 	 */
 	public static boolean hasStereotype(Element element, java.lang.Class<? extends EObject> clazz) {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index cd8d62498a8..ff974a517e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -178,11 +178,10 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 				final String bindHeaderFileName = locStrategy.getFileName(classifier) + Constants.DOT + hppExt;

 				generateFile(bindHeaderFileName, commentHeader + CppClassifierGenerator.generateBindHeaderCode(classifier));

 

-				final String bindBodyFileName = classifier.getName() + Constants.DOT + cppExt;

+				final String bindBodyFileName = locStrategy.getFileName(classifier) + Constants.DOT + cppExt;

 				generateFile(bindBodyFileName, commentHeader + CppClassifierGenerator.generateBindBodyCode(classifier));

 			}

 			else {

-

 				// Class Header file generation

 				final String classHeaderFileName = locStrategy.getFileName(classifier) + Constants.DOT + hppExt;

 				generateFile(classHeaderFileName, commentHeader + CppClassifierGenerator.generateClassHeaderCode(classifier));

@@ -241,6 +240,4 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 				GenUtils.hasStereotype(element, External.class) ||

 				GenUtils.hasStereotypeTree(element, ExternLibrary.class);

 	}

-

-

 }

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 9dd72f63bd6..7679a73abfe 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -138,6 +138,10 @@ public class CppGenUtils {
 			// always use the short name for types within the ANSI C library
 			return ne.getName();
 		}
+		else if (owner instanceof ClassifierTemplateParameter) {
+			// return short name for template in Type
+			return ne.getName();
+		}
 
 		String qName = ne.getName();
 		if (currentNS == ne.getNamespace()) {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
index 633f6c52673..184390e5135 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
@@ -48,16 +48,16 @@ class CppClassifierGenerator {
 		
 		«CppIncludeUtil.CppIncludeHeader(classifier)»
 		
-		«var tb = classifier.templateBindings»
-		«var templateElement = tb.get(0)»
+		«var tb = GenUtils.getTemplateBinding(classifier)»
+		«var templateElement = tb.targets.get(0)»
 		«CppIncludeUtil.includeDirective(
 			GenUtils.getFullPath(classifier.package) + '/' + (templateElement.owner as NamedElement).name + '.' +
 				CppCodeGenUtils.getHeaderSuffix())»
 		
 		«CppGenUtils.openNS(classifier)»
 		/************************************************************/
-		typedef «(templateElement.owner as NamedElement).name»«FOR ps : templateElement.parameterSubstitutions»«CppTemplates.
-			CppTemplateBindingParameter(ps)»«ENDFOR» «classifier.name»;
+		typedef «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions SEPARATOR ', '»«
+			CppTemplates.CppTemplateBindingParameter(ps)»«ENDFOR»> «classifier.name»;
 		
 		«CppGenUtils.closeNS(classifier)»
 		
@@ -96,10 +96,10 @@ class CppClassifierGenerator {
 		«ENDFOR»
 		
 		/************************************************************/
-		«var tb = GenUtils.getTemplateBindings(classifier as Class)»
+		«var tb = GenUtils.getTemplateBinding(classifier)»
 		«var templateElement = tb.targets.get(0)»
-		template class «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions»«CppTemplates.
-			CppTemplateBindingParameter(ps)»«ENDFOR»;
+		template class «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions SEPARATOR ', '»«
+			CppTemplates.CppTemplateBindingParameter(ps)»«ENDFOR»>;
 		
 		«CppGenUtils.closeNS(classifier)»
 		
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
index 1898a8c38c2..7ab2661f252 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
@@ -20,10 +20,10 @@ import org.eclipse.papyrus.codegen.base.GenUtils
  * @author Önder GÜRCAN (onder.gurcan@cea.fr)
  */
 class CppEnumerations {
-	static def CppEnumerationDefinition(Enumeration enume) '''
-		«CppDocumentation.CppElementDoc(enume)»
-		enum «enume.name» {
-			«FOR ownedLiteral : enume.ownedLiterals»
+	static def CppEnumerationDefinition(Enumeration enumeration) '''
+		«CppDocumentation.CppElementDoc(enumeration)»
+		enum «enumeration.name» {
+			«FOR ownedLiteral : enumeration.ownedLiterals»
 				«CppDocumentation.CppElementDoc(ownedLiteral)»
 				«ownedLiteral.name»«IF GenUtils.hasStereotype(ownedLiteral, CppInit)»«UMLUtil.
 				getStereotypeApplication(ownedLiteral, CppInit).value»«ENDIF»,
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
index 5d644df9701..b510c788a42 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
@@ -76,7 +76,7 @@ class CppOperations {
 	
 	static def CppConstInit(Operation operation) {
 		if (GenUtils.hasStereotype(operation, ConstInit) && GenUtils.hasStereotype(operation, Create)) {
-			(UMLUtil.getStereotypeApplication(operation, ConstInit) as ConstInit).initialisation
+			": " + UMLUtil.getStereotypeApplication(operation, ConstInit).initialisation
 		}
 	}
 
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
index 035c06912b5..a16fe1d31b6 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
@@ -130,10 +130,22 @@ public class CreateJavaValidationPluginHandler extends AbstractHandler {
 				existingProject = root.getProject(uri.segment(1));

 			}

 			IProject hostingProject = existingProject;

+			Shell shell = Display.getDefault().getActiveShell();

+

+			boolean isPlugin = false;

+			try {

+				isPlugin = hostingProject.getNature("org.eclipse.pde.PluginNature") != null; //$NON-NLS-1$

+				if (!isPlugin) {

+					// hosting project is not a plugin

+					MessageDialog.openWarning(shell, Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPlugin, String.format(Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication, hostingProject.getName()));

+				}

+			}

+			catch (CoreException e) {

+				Activator.log.error(e);

+			}

 		

 			int question = 0;

-			Shell shell = Display.getDefault().getActiveShell();

-			if ((existingProject != null) && existingProject.exists()) {

+			if ((existingProject != null) && existingProject.exists() && isPlugin) {

 				MessageDialog dialog = new MessageDialog(shell,

 						Messages.CreateJavaValidationPluginHandler_ChoosePluginGeneration, null,

 						Messages.CreateJavaValidationPluginHandler_HowtoGeneratePlugin, MessageDialog.QUESTION,

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
index eb9fa457e06..8be2b41e53a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
@@ -31,6 +31,8 @@ public class Messages extends NLS {
 	public static String CreateJavaValidationPluginHandler_SelectExisting;
 	public static String CreateJavaValidationPluginHandler_HostCurrent;
 	public static String CreateJavaValidationPluginHandler_HowtoGeneratePlugin;
+	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPlugin;
+	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication;
 	public static String CreateJavaValidationPluginHandler_ProfileMustBeDefined;
 	static {
 		// initialize resource bundle
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
index e4a290ae752..dfa481433c8 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
@@ -8,4 +8,6 @@ CreateJavaValidationPluginHandler_GenerateIntoExisting=Generate DSML code into e
 CreateJavaValidationPluginHandler_HostCurrent=Host in current plugin
 CreateJavaValidationPluginHandler_SelectExisting=Select an existing plugin
 CreateJavaValidationPluginHandler_HowtoGeneratePlugin=How should the plugin be generated?
+CreateJavaValidationPluginHandler_ProfileIsNotAPlugin=Profile is not a plugin
+CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication=The project (%s) that hosts the profile is not a plugin. Verify that the project itself is imported into the workspace. If you continue, the option to generate into the hosting plugin is not available. Papyrus will also not be able to create a dependency to the DSML plugin for you.
 CreateJavaValidationPluginHandler_ProfileMustBeDefined=The profile must be defined in order to generate OCL Constraints
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
index 4d1df6080ea..38e56875bdc 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit.ui,
  org.eclipse.rmf.reqif10.edit;bundle-version="0.10.0",
  org.eclipse.papyrus.uml.extensionpoints,
- org.eclipse.emf.compare;bundle-version="3.1.0",
  org.eclipse.papyrus.uml.diagram.profile,
  org.eclipse.papyrus.uml.profile,
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",
@@ -40,9 +39,39 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets.toolbox
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.req.reqif,
- org.eclipse.papyrus.req.reqif.assistant,
- org.eclipse.papyrus.req.reqif.integration.assistant,
- org.eclipse.papyrus.req.reqif.integration.command,
- org.eclipse.papyrus.req.reqif.integration.transformation,
- org.eclipse.papyrus.req.reqif.queries,
+Export-Package: org.eclipse.papyrus.req.reqif;uses:="org.osgi.framework,org.eclipse.ui.plugin",
+ org.eclipse.papyrus.req.reqif.assistant;
+  uses:="org.eclipse.uml2.uml,
+   org.eclipse.swt.widgets,
+   org.eclipse.core.resources,
+   org.eclipse.ui.forms.widgets,
+   org.eclipse.jface.wizard,
+   org.eclipse.ui.forms",
+ org.eclipse.papyrus.req.reqif.integration.assistant;
+  uses:="org.eclipse.swt.widgets,
+   org.eclipse.jface.wizard,
+   org.eclipse.jface.viewers,
+   org.eclipse.ui,
+   org.eclipse.papyrus.infra.core.services,
+   org.eclipse.papyrus.editor,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.papyrus.infra.core.resource,
+   org.eclipse.emf.transaction,
+   org.eclipse.papyrus.uml.profile.ui.dialogs,
+   org.eclipse.papyrus.req.reqif.assistant",
+ org.eclipse.papyrus.req.reqif.integration.command;
+  uses:="org.eclipse.papyrus.uml.tools.profile.definition,
+   org.eclipse.core.runtime,
+   org.eclipse.uml2.uml,
+   org.eclipse.gmf.runtime.common.core.command,
+   org.eclipse.emf.common.util,
+   org.eclipse.gmf.runtime.emf.commands.core.command,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.transaction",
+ org.eclipse.papyrus.req.reqif.integration.transformation;
+  uses:="org.eclipse.papyrus.req.reqif.transformation,
+   org.eclipse.uml2.uml,
+   org.eclipse.rmf.reqif10,
+   org.eclipse.emf.transaction",
+ org.eclipse.papyrus.req.reqif.queries;uses:="org.eclipse.papyrus.emf.facet.query.java.core,org.eclipse.uml2.uml,org.eclipse.papyrus.emf.facet.efacet.core"
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
index f00b8ba7cdb..29b45d7cbc5 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.req.reqif;

 

 /**

- * list of constant for SysML

+ * list of constants for SysML

  *

  */

 public interface I_SysMLStereotype {

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
index 64b4fb46f79..ef6188449c8 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
@@ -1,23 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

- org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",

- org.eclipse.emf.edit;bundle-version="2.9.0",

- org.eclipse.emf.common,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.1.0",

- org.eclipse.emf.compare.edit;bundle-version="3.1.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.ui;singleton:=tru

- e

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",
+ org.eclipse.emf.edit;bundle-version="2.9.0",
+ org.eclipse.emf.common,
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.1.0",
+ org.eclipse.emf.compare.edit;bundle-version="3.1.0",
+ org.eclipse.papyrus.infra.emf,
+ org.eclipse.compare
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.ui;singleton:=tru
+ e
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
index a29a66de652..5eb383a09d1 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
@@ -1,56 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <!-- <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Open the Papyrus Model Compare Editor"

-            id="org.eclipse.papyrus.uml.compare.ui.command"

-            name="Papyrus Model Compare Editor">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.uml.compare.ui.handler.CompareUMLFileHandler"

-            commandId="org.eclipse.papyrus.uml.compare.ui.command">

-      </handler>

-      

-      

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-    allPopups="true"

-    locationURI="popup:org.eclipse.ui.popup.any?after=additions">

-	<command

-	       commandId="org.eclipse.papyrus.uml.compare.ui.command"

-	       style="push">

-	    <visibleWhen

-	          checkEnabled="false">

-	       <with

-	             variable="selection">

-	          <iterate

-	                ifEmpty="false"

-	                operator="and">

-	             <adapt

-	                   type="org.eclipse.core.resources.IFile">

-	             </adapt>

-	          </iterate>

-	       </with>

-	    </visibleWhen>

-	</command>

-</menuContribution>

-   </extension> -->

-   <extension

-         point="org.eclipse.emf.compare.edit.adapterFactory">

-      <factory

-            class="org.eclipse.papyrus.uml.compare.ui.provider.PapyrusCompareAdapterFactory"

-            ranking="11"

-            supportedTypes="org.eclipse.emf.edit.provider.IItemLabelProvider"

-            uri="http://www.eclipse.org/uml2/5.0.0/UML">

-      </factory>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.compare.ui.actions.CompareInEditor"
+            commandId="org.eclipse.papyrus.uml.compare.ui.compareInEditor">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <and>
+                  <or>
+                     <count
+                           value="2">
+                     </count>
+                     <count
+                           value="3">
+                     </count>
+                  </or>
+                  <iterate>
+                     <adapt
+                           type="org.eclipse.emf.ecore.EObject">
+                        <instanceof
+                              value="org.eclipse.emf.ecore.EObject">
+                        </instanceof>
+                     </adapt>
+                  </iterate>
+               </and>
+            </with>
+         </activeWhen>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.infra.emf.readonly.EnableWriteCommand">
+         <separator
+               name="org.eclipse.papyrus.uml.compare.ui.compareGroup"
+               visible="true">
+         </separator>
+         <menu
+               icon="icons/papyrus_compare_16x16.png"
+               id="org.eclipse.papyrus.uml.compare.ui.compareWithMenu"
+               label="Compare With">
+            <command
+                  commandId="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+                  id="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+                  label="Each Other"
+                  style="push"
+                  tooltip="Papyrus UML Compare">
+            </command>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            id="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+            name="Compare in Editor">
+      </command>
+   </extension>
+   <!-- <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Open the Papyrus Model Compare Editor"
+            id="org.eclipse.papyrus.uml.compare.ui.command"
+            name="Papyrus Model Compare Editor">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.compare.ui.handler.CompareUMLFileHandler"
+            commandId="org.eclipse.papyrus.uml.compare.ui.command">
+      </handler>
+      
+      
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+    allPopups="true"
+    locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+	<command
+	       commandId="org.eclipse.papyrus.uml.compare.ui.command"
+	       style="push">
+	    <visibleWhen
+	          checkEnabled="false">
+	       <with
+	             variable="selection">
+	          <iterate
+	                ifEmpty="false"
+	                operator="and">
+	             <adapt
+	                   type="org.eclipse.core.resources.IFile">
+	             </adapt>
+	          </iterate>
+	       </with>
+	    </visibleWhen>
+	</command>
+</menuContribution>
+   </extension> -->
+   <extension
+         point="org.eclipse.emf.compare.edit.adapterFactory">
+      <factory
+            class="org.eclipse.papyrus.uml.compare.ui.provider.PapyrusCompareAdapterFactory"
+            ranking="11"
+            supportedTypes="org.eclipse.emf.edit.provider.IItemLabelProvider"
+            uri="http://www.eclipse.org/uml2/5.0.0/UML">
+      </factory>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java
new file mode 100644
index 00000000000..6ca87c291eb
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Shuai Li - shuai.li@cea.fr
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.compare.ui.actions;
+
+import java.util.Iterator;
+
+import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.compare.CompareUI;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
+import org.eclipse.emf.compare.ide.ui.internal.handler.AbstractCompareHandler;
+import org.eclipse.emf.compare.ide.ui.internal.handler.SelectAncestorDialog;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class CompareInEditor extends AbstractCompareHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		final IWorkbenchPart activePart = HandlerUtil.getActivePart(event);
+		final ISelection selection = HandlerUtil.getCurrentSelection(event);
+
+		if (selection instanceof IStructuredSelection) {
+			Iterator<?> selectionIterator = ((IStructuredSelection) selection).iterator();
+			Notifier left = null;
+			Notifier right = null;
+			Notifier origin = null;
+
+			left = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			if (selectionIterator.hasNext()) {
+				right = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			}
+			if (selectionIterator.hasNext()) {
+				origin = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			}
+
+			if (origin != null) {
+				Shell shell = HandlerUtil.getActiveShell(event);
+				SelectAncestorDialog dialog = new SelectAncestorDialog(shell, adapterFactory, new Notifier[] {left, right, origin});
+				if (dialog.open() == Window.CANCEL) {
+					return null;
+				} else {
+//					left = dialog.leftNotifier;
+//					right = dialog.rightNotifier;
+//					origin = dialog.originNotifier;
+					// TODO
+				}
+			}
+
+			// Do not compare an object with its ancestor (e.g. operation with its owner class).
+			if (left instanceof EObject
+					&& right instanceof EObject
+					&& (EcoreUtil.isAncestor((EObject) left, (EObject) right) || EcoreUtil.isAncestor((EObject) right, (EObject) left))) {
+				MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor"));
+			} else {
+				final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin);
+				CompareUI.openCompareEditor(input);
+			}
+		}
+		
+		return null;
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml
deleted file mode 100644
index 75e2dca7bfa..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1417096439749"
-			name="UML-RT">
-			<aspectTool description="Create a Capsule"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="composite.tool.class_1417096476020" name="Capsule"
-				refToolId="composite.tool.class">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Capsule" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a CapsulePart"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				id="composite.tool.property_1417096489619" name="CapsulePart"
-				refToolId="composite.tool.property">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::CapsulePart" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>				
-			<aspectTool description="Create an RTConnector"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				id="composite.tool.connector_1417096565130" name="RTConnector"
-				refToolId="composite.tool.connector">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTConnector" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an RTPort"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				id="composite.tool.port_1417096575355" name="RTPort"
-				refToolId="composite.tool.port">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTPort" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
new file mode 100644
index 00000000000..2cca57cec7e
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>

+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="UMLRealTime">

+  <drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT">

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Capsule" label="Capsule" description="Create a Capsule">

+      <icon pluginID="" iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_2008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3010"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3014"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.CapsulePart" label="CapsulePart" description="Create a CapsulePart">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3002"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3005"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3006"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3012"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3018"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3041"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolContainer" label="ProtocolContainer" description="Create a ProtocolContainer">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.RTMessageSet" label="RTMessageSet" description="Create a RTMessageSet">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_2004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3023"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3036"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>

+    </ownedConfigurations>

+  </drawerConfigurations>

+</paletteconfiguration:PaletteConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml
deleted file mode 100644
index f0cdba2174b..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif"  id="Drawer__1416993599968"
-			name="UML-RT">			
-			<aspectTool description="Create a ProtocolContainer"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="clazz.tool.package_1416993803624" name="ProtocolContainer"
-				refToolId="clazz.tool.package">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::ProtocolContainer" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Protocol"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="composite.tool.collaboration_1417096522723" name="Protocol"
-				refToolId="composite.tool.collaboration">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Protocol" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>		
-			<aspectTool description="Create an RTMessageSet"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-				id="clazz.tool.interface_1416994043249" name="RTMessageSet"
-				refToolId="clazz.tool.interface">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTMessageSet" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an RTTrigger"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-				id="clazz.tool.operation_1416994043249" name="RTTrigger"
-				refToolId="clazz.tool.operation">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Realization"
-				iconpath="bundleentry://1075.fwk31149847/icons/full/obj16/Realization.gif"
-				id="clazz.tool.realization_1417455608460" name="Realization"
-				refToolId="clazz.tool.realization" />	
-			<aspectTool description="Create an Usage"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				id="clazz.tool.usage_1417516786109" name="Usage" refToolId="clazz.tool.usage" />			
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
new file mode 100644
index 00000000000..967cbb7a53c
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ASCII"?>

+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="UMLRealTime">

+  <drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT">

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Protocol" label="Protocol" description="Create a Protocol">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Collaboration.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_2008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3010"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3014"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolContainer" label="ProtocolContainer" description="Create a ProtocolContainer">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.RTMessageSet" label="RTMessageSet" description="Create a RTMessageSet">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_2004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3023"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3036"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.uml.Reception" label="RT OutMessage" description="Create a RT OutMessage">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Reception.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.uml.Signal" label="RT InMessage" description="Create a RT InMessage">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Reception.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"/>

+    </ownedConfigurations>

+  </drawerConfigurations>

+</paletteconfiguration:PaletteConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml
deleted file mode 100644
index acd51b33f39..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1416993599969"
-			name="UML-RT">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="createStateMachineCreationTool_1416993776146" name="RTStateMachine"
-				refToolId="createStateMachineCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTStateMachine" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"
-				id="createRegionCreationTool_1416993785626" name="RTRegion"
-				refToolId="createRegionCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTRegion" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="createPseudostateCreationTool_1416993803624" name="RTPseudostate"
-				refToolId="createPseudostateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTPseudostate" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="createTriggerCreationTool_1416993803625" name="RTTrigger"
-				refToolId="createTriggerCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createStateCreationTool_1416994043249" name="RTState (State)"
-				refToolId="createStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createFinalStateCreationTool_1416994043249" name="RTState (Final State)"
-				refToolId="createFinalStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
index 07c27094e6a..e989491b8e7 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
@@ -3,29 +3,13 @@
    <extension
          point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
       <paletteDefinition
-            ID="UML-RT-Composite-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            ID="UML-RT-Protocol-PE"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-CompositeDiagramPaletteExtension"
-            path="palettes/UML-RT.CapsuleDiagram.Palette.xml">
+            name="UML-RT-ProtocolDiagramPaletteExtension"
+            path="palettes/UML-RT.ProtocolDiagram.paletteconfiguration">
          <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-Class-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-ClassDiagramPaletteExtension"
-            path="palettes/UML-RT.ProtocolDiagram.Palette.xml">
-         <Priority
-               name="Medium">
+               name="Low">
          </Priority>
          <editor
                id="org.eclipse.papyrus.uml.diagram.clazz">
@@ -33,22 +17,6 @@
       </paletteDefinition>
    </extension>
    <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-StateMachine-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-StateMachineDiagramPaletteExtension"
-            path="palettes/UML-RT.StateMachineDiagram.Palette.xml">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.statemachine">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
       <configuration
             file="configuration/UMLRT.configuration"
@@ -61,5 +29,21 @@
             model="newchildmenu/newChildMenu.xmi">
       </menuCreationModel>
    </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="UML-RT-Capsule-PE"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+            name="UML-RT-CapsuleDiagramPaletteExtension"
+            path="palettes/UML-RT.CapsuleDiagram.paletteconfiguration">
+         <Priority
+               name="Low">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
 
 </plugin>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
new file mode 100644
index 00000000000..16ad4e2cb6e
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"

+    xmi:id="_sHw4IMQMEeS2vZeHP4gaVg"

+    name="UMLRealTime"

+    identifier="org.eclipse.papyrus.umlrt.elementTypes"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHw4IcQMEeS2vZeHP4gaVg"

+      name="Capsule (2008)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_2008"

+      hint="2008">

+    <iconEntry

+        xmi:id="_sHw4IsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGQMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGQcQMEeS2vZeHP4gaVg"

+      name="Capsule (3004)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3004"

+      hint="3004">

+    <iconEntry

+        xmi:id="_sHyGQsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGRMQMEeS2vZeHP4gaVg"

+      name="Capsule (3008)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3008"

+      hint="3008">

+    <iconEntry

+        xmi:id="_sHyGRcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGRsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGR8QMEeS2vZeHP4gaVg"

+      name="Capsule (3010)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3010"

+      hint="3010">

+    <iconEntry

+        xmi:id="_sHyGSMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGScQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGSsQMEeS2vZeHP4gaVg"

+      name="Capsule (3014)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3014"

+      hint="3014">

+    <iconEntry

+        xmi:id="_sHyGS8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGTMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGTcQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3002)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3002"

+      hint="3002">

+    <iconEntry

+        xmi:id="_sHyGTsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGT8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGUMQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3005)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3005"

+      hint="3005">

+    <iconEntry

+        xmi:id="_sHyGUcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGUsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGU8QMEeS2vZeHP4gaVg"

+      name="CapsulePart (3006)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3006"

+      hint="3006">

+    <iconEntry

+        xmi:id="_sHyGVMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGVcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGVsQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3012)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3012"

+      hint="3012">

+    <iconEntry

+        xmi:id="_sHyGV8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGWMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGWcQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3018)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3018"

+      hint="3018">

+    <iconEntry

+        xmi:id="_sHyGWsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGW8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGXMQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3041)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3041"

+      hint="3041">

+    <iconEntry

+        xmi:id="_sHyGXcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGXsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOIMlhEeSwZ7pccGhSNg"

+      name="Protocol (2008)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_2008"

+      hint="2008">

+    <iconEntry

+        xmi:id="_emBOIclhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOIslhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOI8lhEeSwZ7pccGhSNg"

+      name="Protocol (3004)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3004"

+      hint="3004">

+    <iconEntry

+        xmi:id="_emBOJMlhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOJclhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOJslhEeSwZ7pccGhSNg"

+      name="Protocol (3008)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3008"

+      hint="3008">

+    <iconEntry

+        xmi:id="_emBOJ8lhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOKMlhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOKclhEeSwZ7pccGhSNg"

+      name="Protocol (3010)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3010"

+      hint="3010">

+    <iconEntry

+        xmi:id="_emBOKslhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOK8lhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOLMlhEeSwZ7pccGhSNg"

+      name="Protocol (3014)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3014"

+      hint="3014">

+    <iconEntry

+        xmi:id="_emBOLclhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOLslhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytUMQMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (2007)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"

+      hint="2007">

+    <iconEntry

+        xmi:id="_sHytUcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_2007</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytUsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytU8QMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (3009)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"

+      hint="3009">

+    <iconEntry

+        xmi:id="_sHytVMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_3009</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytVcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytVsQMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (PapyrusUMLClassDiagram)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"

+      hint="PapyrusUMLClassDiagram">

+    <iconEntry

+        xmi:id="_sHytV8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_1000</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytWMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytWcQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (2004)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_2004"

+      hint="2004">

+    <iconEntry

+        xmi:id="_sHytWsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_2004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytW8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytXMQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3023)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3023"

+      hint="3023">

+    <iconEntry

+        xmi:id="_sHytXcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3023</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytXsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytX8QMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3036)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3036"

+      hint="3036">

+    <iconEntry

+        xmi:id="_sHytYMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3036</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytYcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytYsQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3037)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3037"

+      hint="3037">

+    <iconEntry

+        xmi:id="_sHytY8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3037</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytZMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytZcQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3038)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3038"

+      hint="3038">

+    <iconEntry

+        xmi:id="_sHytZsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3038</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytZ8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
index bf4f7117a82..5cc0294043b 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
@@ -67,5 +67,11 @@
             path="elementtypes/uml-rt.elementtypesconfigurations">

       </elementTypeSet>

    </extension>

-

+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

+      <elementTypeSet

+            id="org.eclipse.papyrus.umlrt.elementTypeSet2"

+            path="elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations">

+      </elementTypeSet>

+   </extension>

 </plugin>