Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrschnekenbu2014-01-28 10:00:42 -0500
committerrschnekenbu2014-01-28 10:00:42 -0500
commitd73cb9fccf26f720aea5ffbe4de84b5e9f2f2a03 (patch)
tree861382d233e8927ffd368d558fa511418691645f
parent90c8fa9d460a87884e90dbfce5f544c275c6b798 (diff)
parent7ee11fcd35aa3294244940e18f3b6956ef570e69 (diff)
downloadorg.eclipse.papyrus-d73cb9fccf26f720aea5ffbe4de84b5e9f2f2a03.tar.gz
org.eclipse.papyrus-d73cb9fccf26f720aea5ffbe4de84b5e9f2f2a03.tar.xz
org.eclipse.papyrus-d73cb9fccf26f720aea5ffbe4de84b5e9f2f2a03.zip
Merge branch 'committers/rschnekenbu/extendedtypes' into streams/0.10-maintenance
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml1
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java50
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java36
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java12
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml19
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java12
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java5
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java4
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java4
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java5
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java14
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java13
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java7
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java4
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java7
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java6
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java7
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java4
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java7
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java6
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java3
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java2
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java74
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java46
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java34
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java1
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java1
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation80
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml286
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes78
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi15
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml4
54 files changed, 659 insertions, 239 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
index 60da86d4885..c6ed11b6ad9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
@@ -35,6 +35,7 @@
<aspectAction
configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration"
configurationModelCreation="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationModelCreation"
+ creationElementValidator="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionCreationElementValidator"
editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionEditHelperAdvice">
</aspectAction>
</extension>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
index 40aba2a7ffe..00ed70a3d0d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
@@ -15,10 +15,11 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.Enumeration;
import org.eclipse.uml2.uml.ValueSpecification;
/**
- * Registry to store converters.
+ * Registry to store onverters.
*/
public class ConverterRegistry {
@@ -54,6 +55,7 @@ public class ConverterRegistry {
converterMaps.put(String.class, new ValueSpecificationToStringConverter());
converterMaps.put(int.class, new ValueSpecificationToIntegerConverter());
converterMaps.put(boolean.class, new ValueSpecificationToBooleanConverter());
+ converterMaps.put(Enumeration.class, new ValueSpecificationToEnumerationConverter());
}
/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
new file mode 100644
index 00000000000..92f5e460d44
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2013 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:
+ * Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Converter for enumeration values
+ */
+public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {
+
+ /**
+ * @param fromType
+ * @param toType
+ */
+ public ValueSpecificationToEnumerationConverter() {
+ super(ValueSpecification.class, Enumeration.class);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object convert(Object fromObject) {
+ if(fromObject instanceof InstanceValue) {
+ InstanceSpecification instanceSpecification = ((InstanceValue)fromObject).getInstance();
+ if(instanceSpecification instanceof EnumerationLiteral) {
+ return ((EnumerationLiteral)instanceSpecification);
+ }
+ }
+
+ return fromObject;
+ }
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
new file mode 100644
index 00000000000..bd969c6452c
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2013 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:
+ * Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
+import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
+
+/**
+ * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}
+ */
+public class SetValuesActionCreationElementValidator implements IActionCreationElementValidator<SetValuesActionConfiguration> {
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canCreate(CreateElementRequest request) {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init(SetValuesActionConfiguration configuration) {
+ }
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
index a95e8cbb114..263ec8afad5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
@@ -89,6 +89,16 @@
</appInfo>
</annotation>
</attribute>
+ <attribute name="creationElementValidator" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator"/>
+ </appInfo>
+ </annotation>
+ </attribute>
</complexType>
</element>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
index 7971f03dfd2..8101df940bd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
@@ -43,8 +43,8 @@ public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFa
IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);
if(advice!=null) {
actionAdvices.add(advice);
- } else {
- Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
+// } else {
+// Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
}
}
if(actionAdvices!=null && actionAdvices.size() > 0) {
@@ -64,8 +64,8 @@ public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFa
IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);
if(containerDescriptor!=null) {
containerDescriptors.add(containerDescriptor);
- } else {
- Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
+// } else {
+// Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);
}
}
if(containerDescriptors!=null && containerDescriptors.size() > 0) {
@@ -85,8 +85,8 @@ public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFa
ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);
if(validator!=null) {
actionValidators.add(validator);
- } else {
- Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
+// } else {
+// Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);
}
}
if(actionValidators!=null && actionValidators.size() > 0) {
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml
index a3cfe3d86d8..0ad8d706b2f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml
@@ -61,7 +61,26 @@
<aspectAction
configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration"
configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationModelCreation"
+ creationElementValidator="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionCreationElementValidator"
editHelperAdvice="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionEditHelperAdvice">
</aspectAction>
</extension>
+ <extension
+ point="org.eclipse.papyrus.infra.extendedtypes.invariantRule">
+ <invariantRule
+ configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration"
+ configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationModelCreation"
+ editHelperAdvice="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeEditHelperAdvice"
+ elementMatcher="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeElementMatcher">
+ </invariantRule>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.infra.extendedtypes.elementMatcherConfiguration">
+ <configuration
+ configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration"
+ configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherModelCreation"
+ factoryClass="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherFactory"
+ name="StereotypedElementMatcher">
+ </configuration>
+ </extension>
</plugin>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java
index 413857ee67a..51660902f12 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java
@@ -3,7 +3,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java
index 53643f34032..69ae0e8f672 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java
@@ -6,7 +6,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java
index 1d4ce0ce121..bc40c1aeb75 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java
@@ -3,7 +3,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java
index 1cdddcb5f67..a1d6ccd6401 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java
@@ -5,12 +5,16 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java
index 70fb1b41cdf..2eed778a4b8 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java
@@ -5,17 +5,12 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java
index 7661929586a..3c90bfe08dc 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java
@@ -7,11 +7,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
@@ -22,7 +19,6 @@ import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigur
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java
index 6ddc0c047c6..a2698616ab2 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java
@@ -4,15 +4,11 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;
-
import org.eclipse.uml2.uml.ValueSpecification;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java
index 2cc26c06139..e7e60456692 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java
@@ -3,7 +3,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java
index 6655c0b38d6..0c0e224886c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java
@@ -4,13 +4,10 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java
index e52bca1bebe..e208eab85bf 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java
@@ -3,9 +3,7 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java
index 99e5c970479..02421289c3c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java
@@ -5,11 +5,8 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java
index a5f4646a00d..bb87024d35f 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java
@@ -3,7 +3,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java
index 32d7d3ae4a5..6741d6c5875 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java
@@ -6,19 +6,14 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java
index 454c222be28..e63821e0e83 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java
@@ -4,16 +4,20 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java
index 2b6d1960d73..93c17c52586 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java
@@ -3,11 +3,8 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java
index 3bd0456a90d..0f4728cb658 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java
@@ -3,7 +3,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java
index 8b561c1c216..24521680d39 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java
@@ -4,14 +4,19 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java
index 8b8667e77cf..ac6018ef18a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java
@@ -5,11 +5,8 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfigu
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java
index b7bc372dde4..7b173f379af 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java
index 30b1e2452ce..1baa6dd9c47 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java
@@ -15,12 +15,11 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java
index 9ef549bab20..2ed19f821eb 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java
@@ -13,13 +13,9 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java
index 657d0cf8e31..fb97d33de37 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java
@@ -16,11 +16,8 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationFactory;
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java
index 6acf4fd091c..e8fd4010490 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java
@@ -14,14 +14,11 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java
index 7c310b822ed..e1de23783d1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java
@@ -13,9 +13,7 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java
index d9138ccc3f3..b21fd66b978 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java
@@ -13,7 +13,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java
index a74c2125dc7..6a35e49cf2c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java
@@ -14,12 +14,10 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java
index 4c2a8aeeb58..5c198dbad62 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java
@@ -15,11 +15,8 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java
index a01619bb623..38aee4e7e5d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatchercon
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java
index 1ae7a1aa4e3..497991723e4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java
@@ -15,12 +15,11 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatchercon
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationFactory;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java
index d2df89b5a92..d3f36f85c90 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java
@@ -13,13 +13,9 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java
index 03053fc5d0a..6065c221727 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java
@@ -16,11 +16,8 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationFactory;
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java
index aba456eeab3..71aa79b3e0c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java
@@ -14,14 +14,11 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatchercon
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java
index 3822b4e00b5..33637e7d2f1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java
@@ -13,9 +13,7 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java
index f0c14d9ef6a..64cbe7a234d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java
@@ -13,7 +13,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java
index 64b4d2a4200..8e078fb62d9 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java
@@ -14,12 +14,10 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatchercon
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-
-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
+import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java
index 433ac141e76..8dcead9cde1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java
@@ -15,11 +15,8 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatchercon
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java
index 92e3e701637..b094da8cec1 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java
@@ -13,8 +13,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;
import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;
-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;
/**
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java
new file mode 100644
index 00000000000..6641258ad0c
--- /dev/null
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Copyright (c) 2013 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:
+ * Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * @author RS211865
+ */
+public class ApplyStereotypeActionCreationElementValidator implements IActionCreationElementValidator<ApplyStereotypeActionConfiguration> {
+
+ protected ApplyStereotypeActionConfiguration configuration;
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canCreate(CreateElementRequest request) {
+ if(configuration == null) {
+ return false;
+ }
+ if(!(request.getContainer() instanceof Element)) {
+ return false;
+ }
+ Element container = (Element)request.getContainer();
+ Package nearestPackage = container.getNearestPackage();
+ if(nearestPackage == null) {
+ return false;
+ }
+ List<Profile> appliedProfiles = nearestPackage.getAllAppliedProfiles();
+ if(appliedProfiles==null) {
+ // no profiles applied, no stereotype can be applied
+ return false;
+ }
+ List<String> appliedProfileNames = new ArrayList<String>();
+ for(Profile profile : appliedProfiles) {
+ appliedProfileNames.add(profile.getQualifiedName());
+ }
+ for(StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {
+ List<String> requiredProfiles = stereotypeToApply.getRequiredProfiles();
+ if(requiredProfiles != null) {
+ for(String requiredProfile : requiredProfiles) {
+ if(!appliedProfileNames.contains(requiredProfile)) {
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init(ApplyStereotypeActionConfiguration configuration) {
+ this.configuration = configuration;
+ }
+}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java
index 4978b777530..ee4b787ec99 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java
@@ -12,8 +12,6 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;
-import java.util.List;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -26,14 +24,18 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;
import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Feature;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.TypedElement;
import org.eclipse.uml2.uml.UMLPackage;
/**
@@ -50,6 +52,14 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
public void init(ApplyStereotypeActionConfiguration configuration) {
this.configuration = configuration;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean approveRequest(IEditCommandRequest request) {
+ return super.approveRequest(request);
+ }
/**
* {@inheritDoc}
@@ -90,7 +100,7 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
Stereotype stereotype = ((Element)elementToConfigure).getApplicableStereotype(stereotypeToApply.getStereotypeQualifiedName());
if(stereotype !=null) {
- ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(editingDomain, (Element)elementToConfigure, stereotype);
+ ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(editingDomain, (Element)elementToConfigure, stereotype, stereotypeToApply.isUpdateName());
if(resultCommand == null) {
resultCommand = applyStereotypeCommand;
} else {
@@ -110,6 +120,7 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
}
}
}
+
}
if(resultCommand != null) {
@@ -141,12 +152,12 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
}
// retrieve structural feature for the element to configure
- EStructuralFeature feature = (EStructuralFeature)stereotype.getFeature(name, true, EcorePackage.eINSTANCE.getEStructuralFeature());
- if(feature == null) {
+ TypedElement typedElement = (TypedElement)stereotype.getMember(name, true, UMLPackage.eINSTANCE.getTypedElement());
+ if(typedElement == null) {
Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);
return null;
}
- Object value = getStereotypeValue(elementToConfigure, stereotype, feature, featureValue);
+ Object value = getStereotypeValue(elementToConfigure, stereotype, typedElement.getType(), featureValue);
return new SetStereotypeValueCommand(configureRequest.getEditingDomain(), elementToConfigure, stereotype, name, value);
@@ -160,8 +171,8 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
* @param featureValue
* @return
*/
- protected Object getStereotypeValue(Element elementToConfigure, Stereotype stereotype, EStructuralFeature feature, FeatureValue featureValue) {
- return StereotypeFeatureValueUtils.getValue(elementToConfigure, stereotype, feature, featureValue);
+ protected Object getStereotypeValue(Element elementToConfigure, Stereotype stereotype, Type type, FeatureValue featureValue) {
+ return StereotypeFeatureValueUtils.getValue(elementToConfigure, stereotype, type, featureValue);
}
@@ -170,14 +181,20 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
private Stereotype stereotype;
private Element element;
+
+ private boolean rename;
/**
* @param domain editing domain to modify the element
* @param element the element on which stereotype is applied. Must not be <code>null</code>
* @param stereotype the stereotype to modify
+ * @param rename
*/
- public ApplyStereotypeCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype) {
+ public ApplyStereotypeCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype, boolean rename) {
super(domain, "Apply Stereotype "+stereotype.getLabel(), getWorkspaceFiles(element));
+ this.element = element;
+ this.stereotype = stereotype;
+ this.rename = rename;
}
/**
@@ -187,13 +204,18 @@ public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdv
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
try {
Object stereotypeApplication = element.applyStereotype(stereotype);
+ if(rename && element instanceof NamedElement) {
+ if(((NamedElement)element).getNamespace()!=null) {
+ String newName = NamedElementUtil.getDefaultNameWithIncrement(stereotype.getName(), element, ((NamedElement)element).getNamespace().getMembers());
+ ((NamedElement)element).setName(newName);
+ }
+ }
return CommandResult.newOKCommandResult(stereotypeApplication);
} catch (Throwable t) {
Activator.log.error(t);
return CommandResult.newErrorCommandResult(t.getMessage());
}
}
-
}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java
index 8ee5523d07f..b30011bf2f7 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java
@@ -21,8 +21,12 @@ import org.eclipse.papyrus.infra.extendedtypes.Activator;
import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterNotfoundException;
import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterRegistry;
import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationSwitch;
-import org.eclipse.uml2.uml.Feature;
+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.PrimitiveType;
import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.Type;
import org.eclipse.uml2.uml.ValueSpecification;
@@ -42,7 +46,7 @@ public class StereotypeFeatureValueUtils {
* @param valueModel configuration of the value, stored in the model
* @return the real value that will be set to the object or <code>null</code> if none could be computed
*/
- public static Object getValue(final EObject elementToConfigure, final Stereotype stereotype, final EStructuralFeature feature, final FeatureValue featureValue) {
+ public static Object getValue(final EObject elementToConfigure, final Stereotype stereotype, final Type type, final FeatureValue featureValue) {
Object result = new ApplyStereotypeActionConfigurationSwitch<Object>() {
/**
@@ -57,9 +61,29 @@ public class StereotypeFeatureValueUtils {
}
try {
- return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);
+ if(type instanceof PrimitiveType) {
+ final PrimitiveType pType = (PrimitiveType)type;
+ final String name = pType.getName();
+ if(PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {
+ return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);
+ } else if(PrimitivesTypesUtils.UML_INTEGER.equals(name)) {
+ return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+ } else if(PrimitivesTypesUtils.UML_REAL.equals(name)) {
+ return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);
+ } else if(PrimitivesTypesUtils.UML_STRING.equals(name)) {
+ return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+ } else if(PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {
+ return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+ } else { //custom PrimitiveType
+ return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+ }
+ } else if(type instanceof Enumeration) {
+ return ConverterRegistry.getSingleton().convert(Enumeration.class, valueSpecification);
+ } else if(type instanceof DataType) {//FIXME manage the data type
+ return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+ }
} catch (ConverterNotfoundException e) {
- Activator.log.error("Impossible to convert "+valueSpecification+ " to fit feature type :"+feature, e);
+ Activator.log.error("Impossible to convert "+valueSpecification+ " to fit feature type :"+type, e);
}
return super.caseConstantValue(object);
}
@@ -88,7 +112,7 @@ public class StereotypeFeatureValueUtils {
// resolve one by one all features in the values list of this listvalue
List<Object> results = new ArrayList<Object>();
for(FeatureValue value : object.getValues()) {
- Object singleResult = getValue(elementToConfigure, stereotype, feature, value);
+ Object singleResult = getValue(elementToConfigure, stereotype, type, value);
results.add(singleResult);
}
return results;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java
index 078a76cf6e8..2917800a751 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfigura
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantCreationElementValidator;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java
index 46d735bd46b..7dfb5ea679a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java
@@ -13,7 +13,6 @@
package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;
import org.eclipse.papyrus.infra.extendedtypes.IConfigurableElementMatcherFactory;
-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation
index bb6c4731549..add35f587e1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation
@@ -10,7 +10,7 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_VqgbYGcCEeO5043Nsj3xUw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VqgbYWcCEeO5043Nsj3xUw" x="99" y="50" width="201" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VqgbYWcCEeO5043Nsj3xUw" x="99" y="50" width="201" height="101"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_WnzKEGcCEeO5043Nsj3xUw" type="1026">
<children xmi:type="notation:DecorationNode" xmi:id="_WnzKEmcCEeO5043Nsj3xUw" type="1034"/>
@@ -33,14 +33,88 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wn8UCWcCEeO5043Nsj3xUw"/>
</children>
<element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_WnpZEGcCEeO5043Nsj3xUw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WnzKEWcCEeO5043Nsj3xUw" x="99" y="210" width="201" height="81"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WnzKEWcCEeO5043Nsj3xUw" x="100" y="250" width="201" height="201"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_q9NVwIf4EeOi95YnkGlwiQ" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_q9N80If4EeOi95YnkGlwiQ" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_q9N80Yf4EeOi95YnkGlwiQ" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q9PK8If4EeOi95YnkGlwiQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q9PK8Yf4EeOi95YnkGlwiQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_692H0If4EeOi95YnkGlwiQ" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_69PD0If4EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_692H0Yf4EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_96XjUIf4EeOi95YnkGlwiQ" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_96T48If4EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_96XjUYf4EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Cr704If5EeOi95YnkGlwiQ" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_Cr4xkIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Cr704Yf5EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_EvpZEIf5EeOi95YnkGlwiQ" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_EvoK8If5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_EvpZEYf5EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_M5TAwIf5EeOi95YnkGlwiQ" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_M5P9cIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_M5TAwYf5EeOi95YnkGlwiQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_q9N80of4EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_q9N804f4EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_q9N81If4EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9N81Yf4EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_q9N81of4EeOi95YnkGlwiQ" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q9RAIIf4EeOi95YnkGlwiQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q9RAIYf4EeOi95YnkGlwiQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_q9N814f4EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_q9N82If4EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_q9N82Yf4EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9N82of4EeOi95YnkGlwiQ"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_q883EIf4EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9NVwYf4EeOi95YnkGlwiQ" x="400" y="269" width="201" height="182"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Jb1bYIf5EeOi95YnkGlwiQ" type="2006">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Jb2CcIf5EeOi95YnkGlwiQ" type="5023"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Jb2CcYf5EeOi95YnkGlwiQ" type="1063">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Jb7iAIf5EeOi95YnkGlwiQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Jb7iAYf5EeOi95YnkGlwiQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_KLQGIIf5EeOi95YnkGlwiQ" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="ExtendedTypesTestsProfile.profile.uml#_KLO4AIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KLQGIYf5EeOi95YnkGlwiQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_KuIwwIf5EeOi95YnkGlwiQ" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="ExtendedTypesTestsProfile.profile.uml#_KuG7kIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KuIwwYf5EeOi95YnkGlwiQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Jb2Ccof5EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Jb2Cc4f5EeOi95YnkGlwiQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Jb2CdIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jb2CdYf5EeOi95YnkGlwiQ"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="ExtendedTypesTestsProfile.profile.uml#_Jbk8sIf5EeOi95YnkGlwiQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jb1bYYf5EeOi95YnkGlwiQ" x="700" y="350" width="151" height="101"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_sK_p8Wb7EeOyHY5evmQkxA"/>
<element xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>
<edges xmi:type="notation:Connector" xmi:id="_tmJVIGcCEeO5043Nsj3xUw" type="1013" source="_WnzKEGcCEeO5043Nsj3xUw" target="_VqWqYGcCEeO5043Nsj3xUw" routing="Rectilinear">
<styles xmi:type="notation:FontStyle" xmi:id="_tmJVIWcCEeO5043Nsj3xUw"/>
<element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_tmALMWcCEeO5043Nsj3xUw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tmJVImcCEeO5043Nsj3xUw" points="[-30, -3, 0, 120]$[-30, -82, 0, 41]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tmJVImcCEeO5043Nsj3xUw" points="[-30, -4, 1, 150]$[-30, -103, 1, 51]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tmcQEGcCEeO5043Nsj3xUw" id="(0.647887323943662,0.045454545454545456)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_u3Bf8If4EeOi95YnkGlwiQ" type="1013" source="_q9NVwIf4EeOi95YnkGlwiQ" target="_VqWqYGcCEeO5043Nsj3xUw" routing="Rectilinear">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_45ecUIf4EeOi95YnkGlwiQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_45fDYIf4EeOi95YnkGlwiQ" key="closestDistance" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:FontStyle" xmi:id="_u3Bf8Yf4EeOi95YnkGlwiQ"/>
+ <element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_u249EIf4EeOi95YnkGlwiQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u3Bf8of4EeOi95YnkGlwiQ" points="[1, 0, 302, 169]$[1, -69, 302, 100]$[-301, -69, 0, 100]$[-301, -118, 0, 51]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u3L4AIf4EeOi95YnkGlwiQ" id="(0.4975124378109453,0.0)"/>
+ </edges>
</notation:Diagram>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml
index 5c8afd85c88..4e4f00f3fe5 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml
@@ -1,280 +1,370 @@
<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sK148Gb7EeOyHY5evmQkxA" name="ExtendedTypesTestsProfile" metaclassReference="_VqM5YGcCEeO5043Nsj3xUw _vpg7EGcCEeO5043Nsj3xUw" metamodelReference="_sK148Wb7EeOyHY5evmQkxA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwkWcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sK148Gb7EeOyHY5evmQkxA" name="ExtendedTypesTestsProfile" metaclassReference="_VqM5YGcCEeO5043Nsj3xUw _vpg7EGcCEeO5043Nsj3xUw" metamodelReference="_sK148Wb7EeOyHY5evmQkxA">
+ <eAnnotations xmi:id="_CwRwkWcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_P0tpAIf5EeOi95YnkGlwiQ" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7" nsPrefix="ExtendedTypesTestsProfile">
+ <eAnnotations xmi:id="_P0wsUYf5EeOi95YnkGlwiQ" source="PapyrusVersion">
+ <details xmi:id="_P0wsUof5EeOi95YnkGlwiQ" key="Version" value="0.0.8"/>
+ <details xmi:id="_P0wsU4f5EeOi95YnkGlwiQ" key="Comment" value=""/>
+ <details xmi:id="_P0wsVIf5EeOi95YnkGlwiQ" key="Copyright" value=""/>
+ <details xmi:id="_P0wsVYf5EeOi95YnkGlwiQ" key="Date" value="2014-01-28"/>
+ <details xmi:id="_P0wsVof5EeOi95YnkGlwiQ" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_P0tpAYf5EeOi95YnkGlwiQ" name="PackageWithComponents">
+ <eAnnotations xmi:id="_P0tpAof5EeOi95YnkGlwiQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P0tpA4f5EeOi95YnkGlwiQ" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_P0tpBYf5EeOi95YnkGlwiQ" name="StereotypeWithFeaturesToSet">
+ <eAnnotations xmi:id="_P0tpBof5EeOi95YnkGlwiQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_q883EIf4EeOi95YnkGlwiQ"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_P0tpB4f5EeOi95YnkGlwiQ" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P0tpCYf5EeOi95YnkGlwiQ" name="stringFeature" ordered="false" unique="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P0tpC4f5EeOi95YnkGlwiQ" name="multiStrings" ordered="false" unique="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P0tpDYf5EeOi95YnkGlwiQ" name="value" ordered="false" unique="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P0tpD4f5EeOi95YnkGlwiQ" name="boolean" ordered="false" unique="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_P0tpEYf5EeOi95YnkGlwiQ" name="enumeration" ordered="false" unique="false" lowerBound="1" eType="_P0tpE4f5EeOi95YnkGlwiQ"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_P0tpE4f5EeOi95YnkGlwiQ" name="Enum">
+ <eAnnotations xmi:id="_P0tpFIf5EeOi95YnkGlwiQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Jbk8sIf5EeOi95YnkGlwiQ"/>
+ <eLiterals xmi:id="_P0tpFYf5EeOi95YnkGlwiQ" name="Enum1"/>
+ <eLiterals xmi:id="_P0tpFof5EeOi95YnkGlwiQ" name="Enum2" value="1"/>
+ </eClassifiers>
+ </contents>
<contents xmi:type="ecore:EPackage" xmi:id="_4fuMcXk6EeOwQstt3pSj0Q" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_4fuMcHk6EeOwQstt3pSj0Q/6" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4fuMd3k6EeOwQstt3pSj0Q" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fuMeHk6EeOwQstt3pSj0Q" key="Version" value="0.0.7"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fuMeXk6EeOwQstt3pSj0Q" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fuMenk6EeOwQstt3pSj0Q" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fuMe3k6EeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fuMfHk6EeOwQstt3pSj0Q" key="Author" value=""/>
+ <eAnnotations xmi:id="_4fuMd3k6EeOwQstt3pSj0Q" source="PapyrusVersion">
+ <details xmi:id="_4fuMeHk6EeOwQstt3pSj0Q" key="Version" value="0.0.7"/>
+ <details xmi:id="_4fuMeXk6EeOwQstt3pSj0Q" key="Comment" value=""/>
+ <details xmi:id="_4fuMenk6EeOwQstt3pSj0Q" key="Copyright" value=""/>
+ <details xmi:id="_4fuMe3k6EeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
+ <details xmi:id="_4fuMfHk6EeOwQstt3pSj0Q" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4fuMcnk6EeOwQstt3pSj0Q" name="PackageWithComponents">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4fuMc3k6EeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_4fuMc3k6EeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4fuMdHk6EeOwQstt3pSj0Q" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_3cRIAHkREeOwQstt3pSj0Q" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRvEnkREeOwQstt3pSj0Q" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3cRvE3kREeOwQstt3pSj0Q" key="Version" value="0.0.6"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3cRvFHkREeOwQstt3pSj0Q" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3cRvFXkREeOwQstt3pSj0Q" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3cRvFnkREeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3cRvF3kREeOwQstt3pSj0Q" key="Author" value=""/>
+ <eAnnotations xmi:id="_3cRvEnkREeOwQstt3pSj0Q" source="PapyrusVersion">
+ <details xmi:id="_3cRvE3kREeOwQstt3pSj0Q" key="Version" value="0.0.6"/>
+ <details xmi:id="_3cRvFHkREeOwQstt3pSj0Q" key="Comment" value=""/>
+ <details xmi:id="_3cRvFXkREeOwQstt3pSj0Q" key="Copyright" value=""/>
+ <details xmi:id="_3cRvFnkREeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
+ <details xmi:id="_3cRvF3kREeOwQstt3pSj0Q" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3cRIAXkREeOwQstt3pSj0Q" name="PackageWithComponents">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRIAnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_3cRIAnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3cRIA3kREeOwQstt3pSj0Q" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3cRIBXkREeOwQstt3pSj0Q" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRIBnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_3cRIBnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3cRIB3kREeOwQstt3pSj0Q" name="kind" ordered="false" lowerBound="1" eType="_3cRIC3kREeOwQstt3pSj0Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3cRICXkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_3cRIC3kREeOwQstt3pSj0Q" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRIDHkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_3cRIDXkREeOwQstt3pSj0Q" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_3cRIDnkREeOwQstt3pSj0Q" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_3cRID3kREeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_3cRIDHkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_3cRIDXkREeOwQstt3pSj0Q" name="Mechanical"/>
+ <eLiterals xmi:id="_3cRIDnkREeOwQstt3pSj0Q" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_3cRID3kREeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3cRIEHkREeOwQstt3pSj0Q" name="Equipment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRIEXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_3cRIEXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3cRIEnkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3cRIFHkREeOwQstt3pSj0Q" name="Partition">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3cRIFXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_3cRIFXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3cRIFnkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_iBclMHkREeOwQstt3pSj0Q" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_iBb-IHkREeOwQstt3pSj0Q/4" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBg2oHkREeOwQstt3pSj0Q" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iBg2oXkREeOwQstt3pSj0Q" key="Version" value="0.0.5"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iBg2onkREeOwQstt3pSj0Q" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iBg2o3kREeOwQstt3pSj0Q" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iBg2pHkREeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iBg2pXkREeOwQstt3pSj0Q" key="Author" value=""/>
+ <eAnnotations xmi:id="_iBg2oHkREeOwQstt3pSj0Q" source="PapyrusVersion">
+ <details xmi:id="_iBg2oXkREeOwQstt3pSj0Q" key="Version" value="0.0.5"/>
+ <details xmi:id="_iBg2onkREeOwQstt3pSj0Q" key="Comment" value=""/>
+ <details xmi:id="_iBg2o3kREeOwQstt3pSj0Q" key="Copyright" value=""/>
+ <details xmi:id="_iBg2pHkREeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
+ <details xmi:id="_iBg2pXkREeOwQstt3pSj0Q" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_iBclMXkREeOwQstt3pSj0Q" name="PackageWithComponents">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBclMnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_iBclMnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iBclM3kREeOwQstt3pSj0Q" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_iBclNXkREeOwQstt3pSj0Q" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBclNnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_iBclNnkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_iBclN3kREeOwQstt3pSj0Q" name="kind" ordered="false" lowerBound="1" eType="_iBclO3kREeOwQstt3pSj0Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iBclOXkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_iBclO3kREeOwQstt3pSj0Q" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBclPHkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iBclPXkREeOwQstt3pSj0Q" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iBclPnkREeOwQstt3pSj0Q" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_iBclP3kREeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_iBclPHkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_iBclPXkREeOwQstt3pSj0Q" name="Mechanical"/>
+ <eLiterals xmi:id="_iBclPnkREeOwQstt3pSj0Q" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_iBclP3kREeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_iBclQHkREeOwQstt3pSj0Q" name="Equipment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBclQXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_iBclQXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iBclQnkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_iBclRHkREeOwQstt3pSj0Q" name="Partition">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iBclRXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_iBclRXkREeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_iBclRnkREeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_YXaw4HkGEeOwQstt3pSj0Q" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_YXV4YHkGEeOwQstt3pSj0Q/3" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXfpYXkGEeOwQstt3pSj0Q" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YXfpYnkGEeOwQstt3pSj0Q" key="Version" value="0.0.4"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YXfpY3kGEeOwQstt3pSj0Q" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YXfpZHkGEeOwQstt3pSj0Q" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YXfpZXkGEeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YXfpZnkGEeOwQstt3pSj0Q" key="Author" value=""/>
+ <eAnnotations xmi:id="_YXfpYXkGEeOwQstt3pSj0Q" source="PapyrusVersion">
+ <details xmi:id="_YXfpYnkGEeOwQstt3pSj0Q" key="Version" value="0.0.4"/>
+ <details xmi:id="_YXfpY3kGEeOwQstt3pSj0Q" key="Comment" value=""/>
+ <details xmi:id="_YXfpZHkGEeOwQstt3pSj0Q" key="Copyright" value=""/>
+ <details xmi:id="_YXfpZXkGEeOwQstt3pSj0Q" key="Date" value="2014-01-09"/>
+ <details xmi:id="_YXfpZnkGEeOwQstt3pSj0Q" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_YXaw4XkGEeOwQstt3pSj0Q" name="PackageWithComponents">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXaw4nkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_YXaw4nkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YXaw43kGEeOwQstt3pSj0Q" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_YXaw5XkGEeOwQstt3pSj0Q" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXaw5nkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_YXaw5nkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_YXaw53kGEeOwQstt3pSj0Q" name="kind" ordered="false" lowerBound="1" eType="_YXaw63kGEeOwQstt3pSj0Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YXaw6XkGEeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_YXaw63kGEeOwQstt3pSj0Q" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXaw7HkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_YXaw7XkGEeOwQstt3pSj0Q" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_YXaw7nkGEeOwQstt3pSj0Q" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_YXaw73kGEeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_YXaw7HkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_YXaw7XkGEeOwQstt3pSj0Q" name="Mechanical"/>
+ <eLiterals xmi:id="_YXaw7nkGEeOwQstt3pSj0Q" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_YXaw73kGEeOwQstt3pSj0Q" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_YXaw8HkGEeOwQstt3pSj0Q" name="Equipment">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXaw8XkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_YXaw8XkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YXaw8nkGEeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_YXaw9HkGEeOwQstt3pSj0Q" name="Partition">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YXaw9XkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_YXaw9XkGEeOwQstt3pSj0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_YXaw9nkGEeOwQstt3pSj0Q" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_5IfFAWcEEeO5043Nsj3xUw" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_5IfFAGcEEeO5043Nsj3xUw/2" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IgTJGcEEeO5043Nsj3xUw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJWcEEeO5043Nsj3xUw" key="Version" value="0.0.3"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJmcEEeO5043Nsj3xUw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJ2cEEeO5043Nsj3xUw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTKGcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTKWcEEeO5043Nsj3xUw" key="Author" value=""/>
+ <eAnnotations xmi:id="_5IgTJGcEEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:id="_5IgTJWcEEeO5043Nsj3xUw" key="Version" value="0.0.3"/>
+ <details xmi:id="_5IgTJmcEEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:id="_5IgTJ2cEEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:id="_5IgTKGcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:id="_5IgTKWcEEeO5043Nsj3xUw" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfFAmcEEeO5043Nsj3xUw" name="PackageWithComponents">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFA2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_5IfFA2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfFBGcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfFBmcEEeO5043Nsj3xUw" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFB2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_5IfFB2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5IfFCGcEEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_5IfFDGcEEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfFCmcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_5IfFDGcEEeO5043Nsj3xUw" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFDWcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfFDmcEEeO5043Nsj3xUw" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfsEGcEEeO5043Nsj3xUw" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfsEWcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_5IfFDWcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_5IfFDmcEEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:id="_5IfsEGcEEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_5IfsEWcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfsEmcEEeO5043Nsj3xUw" name="BlockExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfsE2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_5IfsE2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfsFGcEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfsFmcEEeO5043Nsj3xUw" name="ClassExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfsF2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_5IfsF2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfsGGcEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_CD2S8WcEEeO5043Nsj3xUw" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_CD2S8GcEEeO5043Nsj3xUw/1" nsPrefix="ExtendedTypesTestsProfile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TDWcEEeO5043Nsj3xUw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TDmcEEeO5043Nsj3xUw" key="Version" value="0.0.2"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TD2cEEeO5043Nsj3xUw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEGcEEeO5043Nsj3xUw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEWcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEmcEEeO5043Nsj3xUw" key="Author" value=""/>
+ <eAnnotations xmi:id="_CD2TDWcEEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:id="_CD2TDmcEEeO5043Nsj3xUw" key="Version" value="0.0.2"/>
+ <details xmi:id="_CD2TD2cEEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:id="_CD2TEGcEEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:id="_CD2TEWcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:id="_CD2TEmcEEeO5043Nsj3xUw" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2S8mcEEeO5043Nsj3xUw" name="PackageWithComponent">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S82cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_CD2S82cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2S9GcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2S9mcEEeO5043Nsj3xUw" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S92cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CD2S92cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_CD2S-GcEEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_CD2S_GcEEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2S-mcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_CD2S_GcEEeO5043Nsj3xUw" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S_WcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2S_mcEEeO5043Nsj3xUw" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2S_2cEEeO5043Nsj3xUw" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2TAGcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_CD2S_WcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_CD2S_mcEEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:id="_CD2S_2cEEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_CD2TAGcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2TAWcEEeO5043Nsj3xUw" name="BlockExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TAmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CD2TAmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2TA2cEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2TBWcEEeO5043Nsj3xUw" name="ClassExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TBmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CD2TBmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2TB2cEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
<contents xmi:type="ecore:EPackage" xmi:id="_CwRwkmcDEeO5043Nsj3xUw" name="Profile" nsURI="http:///schemas/Profile/_CwRwkGcDEeO5043Nsj3xUw/0" nsPrefix="Profile">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwbhlGcDEeO5043Nsj3xUw" source="PapyrusVersion">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhlWcDEeO5043Nsj3xUw" key="Version" value="0.0.1"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhlmcDEeO5043Nsj3xUw" key="Comment" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Cwbhl2cDEeO5043Nsj3xUw" key="Copyright" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhmGcDEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhmWcDEeO5043Nsj3xUw" key="Author" value=""/>
+ <eAnnotations xmi:id="_CwbhlGcDEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:id="_CwbhlWcDEeO5043Nsj3xUw" key="Version" value="0.0.1"/>
+ <details xmi:id="_CwbhlmcDEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:id="_Cwbhl2cDEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:id="_CwbhmGcDEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:id="_CwbhmWcDEeO5043Nsj3xUw" key="Author" value=""/>
</eAnnotations>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwk2cDEeO5043Nsj3xUw" name="PackageWithComponent">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwlGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eAnnotations xmi:id="_CwRwlGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwlWcDEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwl2cDEeO5043Nsj3xUw" name="Module">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwmGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CwRwmGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_CwRwmWcDEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_CwRwnWcDEeO5043Nsj3xUw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwm2cDEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_CwRwnWcDEeO5043Nsj3xUw" name="ModuleKind">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwnmcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwn2cDEeO5043Nsj3xUw" name="Mechanical"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwoGcDEeO5043Nsj3xUw" name="Electrical" value="1"/>
- <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwoWcDEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ <eAnnotations xmi:id="_CwRwnmcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eLiterals xmi:id="_CwRwn2cDEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:id="_CwRwoGcDEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:id="_CwRwoWcDEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwomcDEeO5043Nsj3xUw" name="BlockExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwo2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CwRwo2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwpGcDEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwpmcDEeO5043Nsj3xUw" name="ClassExtension">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwp2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
+ <eAnnotations xmi:id="_CwRwp2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwqGcDEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
</eAnnotations>
- <elementImport xmi:type="uml:ElementImport" xmi:id="_VqM5YGcCEeO5043Nsj3xUw" alias="Element">
+ <elementImport xmi:id="_VqM5YGcCEeO5043Nsj3xUw" alias="Element">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
</elementImport>
- <elementImport xmi:type="uml:ElementImport" xmi:id="_vpg7EGcCEeO5043Nsj3xUw" alias="Class">
+ <elementImport xmi:id="_vpg7EGcCEeO5043Nsj3xUw" alias="Class">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</elementImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_sK148Wb7EeOyHY5evmQkxA">
+ <packageImport xmi:id="_sK148Wb7EeOyHY5evmQkxA">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_sK148mb7EeOyHY5evmQkxA">
+ <packageImport xmi:id="_sK148mb7EeOyHY5evmQkxA">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WnpZEGcCEeO5043Nsj3xUw" name="PackageWithComponents">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_tmALMGcCEeO5043Nsj3xUw" name="base_Element" association="_tmALMWcCEeO5043Nsj3xUw">
+ <ownedAttribute xmi:id="_tmALMGcCEeO5043Nsj3xUw" name="base_Element" association="_tmALMWcCEeO5043Nsj3xUw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_tmALMWcCEeO5043Nsj3xUw" name="E_PackageWithComponents_Element1" memberEnd="_tmALMmcCEeO5043Nsj3xUw _tmALMGcCEeO5043Nsj3xUw">
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tmALMmcCEeO5043Nsj3xUw" name="extension_PackageWithComponents" type="_WnpZEGcCEeO5043Nsj3xUw" aggregation="composite" association="_tmALMWcCEeO5043Nsj3xUw"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_q883EIf4EeOi95YnkGlwiQ" name="StereotypeWithFeaturesToSet">
+ <ownedAttribute xmi:id="_u23u8If4EeOi95YnkGlwiQ" name="base_Element" association="_u249EIf4EeOi95YnkGlwiQ">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_69PD0If4EeOi95YnkGlwiQ" name="stringFeature" visibility="public" isUnique="false">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9UtRgIf4EeOi95YnkGlwiQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9Ut4kIf4EeOi95YnkGlwiQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_9UufoIf4EeOi95YnkGlwiQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_96T48If4EeOi95YnkGlwiQ" name="multiStrings" visibility="public" isUnique="false">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CNuO4If5EeOi95YnkGlwiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CNu18If5EeOi95YnkGlwiQ" value="*"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_CNwEEIf5EeOi95YnkGlwiQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_Cr4xkIf5EeOi95YnkGlwiQ" name="value" visibility="public" isUnique="false">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EZe70If5EeOi95YnkGlwiQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EZe70Yf5EeOi95YnkGlwiQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_EZgJ8If5EeOi95YnkGlwiQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_EvoK8If5EeOi95YnkGlwiQ" name="boolean" visibility="public" isUnique="false">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GWGZgIf5EeOi95YnkGlwiQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GWHAkIf5EeOi95YnkGlwiQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_GWI1wIf5EeOi95YnkGlwiQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:id="_M5P9cIf5EeOi95YnkGlwiQ" name="enumeration" visibility="public" type="_Jbk8sIf5EeOi95YnkGlwiQ" isUnique="false">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Oq79gIf5EeOi95YnkGlwiQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oq8kkIf5EeOi95YnkGlwiQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_Oq-ZwIf5EeOi95YnkGlwiQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_u249EIf4EeOi95YnkGlwiQ" name="E_StereotypeWithFeaturesToSet_Element1" memberEnd="_u249EYf4EeOi95YnkGlwiQ _u23u8If4EeOi95YnkGlwiQ">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_u249EYf4EeOi95YnkGlwiQ" name="extension_StereotypeWithFeaturesToSet" type="_q883EIf4EeOi95YnkGlwiQ" aggregation="composite" association="_u249EIf4EeOi95YnkGlwiQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_Jbk8sIf5EeOi95YnkGlwiQ" name="Enum">
+ <ownedLiteral xmi:id="_KLO4AIf5EeOi95YnkGlwiQ" name="Enum1"/>
+ <ownedLiteral xmi:id="_KuG7kIf5EeOi95YnkGlwiQ" name="Enum2"/>
+ </packagedElement>
</uml:Profile>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes
index 9f373097589..5b70afad8e3 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<extendedtypes:ExtendedElementTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extendedtypes="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0" xmlns:invariantcontainerconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0" xmlns:invariantsemantictypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0" xmlns:invariantstereotypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0" xmlns:setvaluesactionconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" name="Tests extended types" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.tests">
+<extendedtypes:ExtendedElementTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeactionconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0" xmlns:extendedtypes="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0" xmlns:invariantcontainerconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0" xmlns:invariantsemantictypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0" xmlns:invariantstereotypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0" xmlns:setvaluesactionconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" name="Tests extended types" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.tests">
<elementType xsi:type="invariantsemantictypeconfiguration:InvariantSemanticTypeConfiguration" name="Component in specific package only" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.specificcomponent">
<iconEntry iconPath="icons/full/obj16/add_obj.gif" bundleId="org.eclipse.ui"/>
<specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
@@ -22,4 +22,80 @@
</featuresToSet>
</actionConfiguration>
</elementType>
+ <elementType xsi:type="extendedtypes:AspectSemanticTypeConfiguration" name="Class With Stereotype" description="Test extended type" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotype">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <actionConfiguration xsi:type="applystereotypeactionconfiguration:ApplyStereotypeActionConfiguration" name="">
+ <stereotypesToApply stereotypeQualifiedName="ExtendedTypesTestsProfile::StereotypeWithFeaturesToSet">
+ <requiredProfiles>ExtendedTypesTestsProfile</requiredProfiles>
+ </stereotypesToApply>
+ </actionConfiguration>
+ </elementType>
+ <elementType xsi:type="extendedtypes:AspectSemanticTypeConfiguration" name="Package With Stereotype And Renamed" description="Test extended type" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotypeRename">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <actionConfiguration xsi:type="applystereotypeactionconfiguration:ApplyStereotypeActionConfiguration" name="">
+ <stereotypesToApply stereotypeQualifiedName="ExtendedTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">
+ <requiredProfiles>ExtendedTypesTestsProfile</requiredProfiles>
+ </stereotypesToApply>
+ </actionConfiguration>
+ </elementType>
+ <elementType xsi:type="extendedtypes:AspectSemanticTypeConfiguration" name="Class With Stereotype And Set Values" description="Test extended type" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotypeSetValues">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <actionConfiguration xsi:type="applystereotypeactionconfiguration:ApplyStereotypeActionConfiguration" name="">
+ <stereotypesToApply stereotypeQualifiedName="ExtendedTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true">
+ <requiredProfiles>ExtendedTypesTestsProfile</requiredProfiles>
+ <featuresToSet featureName="stringFeature">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralString" value="MySingleValue"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="value">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralInteger" value="3"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="boolean">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralBoolean" value="true"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="enumeration">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:InstanceValue">
+ <instance href="ExtendedTypesTestsProfile.profile.uml#_KuG7kIf5EeOi95YnkGlwiQ"/>
+ </valueInstance>
+ </value>
+ </featuresToSet>
+ </stereotypesToApply>
+ </actionConfiguration>
+ </elementType>
+ <elementType xsi:type="extendedtypes:AspectSemanticTypeConfiguration" name="Abstract Class With Stereotype" description="Test extended type" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.abstractclassSimpleStereotype">
+ <specializedTypesID>org.eclipse.papyrus.infra.extendedtypes.tests.aspectabstractclass</specializedTypesID>
+ <actionConfiguration xsi:type="applystereotypeactionconfiguration:ApplyStereotypeActionConfiguration" name="">
+ <stereotypesToApply stereotypeQualifiedName="ExtendedTypesTestsProfile::StereotypeWithFeaturesToSet">
+ <requiredProfiles>ExtendedTypesTestsProfile</requiredProfiles>
+ <featuresToSet featureName="stringFeature">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralString" value="MyOtherValue"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="value">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralInteger" value="18"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="boolean">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:LiteralBoolean" value="true"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="enumeration">
+ <value xsi:type="applystereotypeactionconfiguration:ConstantValue">
+ <valueInstance xsi:type="uml:InstanceValue">
+ <instance href="ExtendedTypesTestsProfile.profile.uml#_KuG7kIf5EeOi95YnkGlwiQ"/>
+ </valueInstance>
+ </value>
+ </featuresToSet>
+ </stereotypesToApply>
+ </actionConfiguration>
+ </elementType>
</extendedtypes:ExtendedElementTypeSet>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi
index 5c39e363e25..78dcd230f83 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi
@@ -7,13 +7,24 @@
label="Test For Extended Types">
<menu xsi:type="ElementCreationMenuModel:CreationMenu"
label="specific Component"
- icon=""
elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.specificcomponent"/>
<menu xsi:type="ElementCreationMenuModel:CreationMenu"
- label="Abstract Class"
+ label="Class - abstract"
icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.aspectabstractclass"/>
<menu xsi:type="ElementCreationMenuModel:CreationMenu"
label="Standard Class"
elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Package - simple stereotype"
+ elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotype"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Class - simple stereotype - rename"
+ elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotypeRename"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Class - simple stereotype - set Values"
+ elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.classSimpleStereotypeSetValues"/>
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="Class - abstract - simple stereotype - set Values"
+ elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.abstractclassSimpleStereotype"/>
</ElementCreationMenuModel:Folder>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
index da1e997aa80..1ae1054eabf 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ExtendedTypesTestsProfile="http:///schemas/ExtendedTypesTestsProfile/_4fuMcHk6EeOwQstt3pSj0Q/6" xmlns:ExtendedTypesTestsProfile_1="http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/ExtendedTypesTestsProfile/_4fuMcHk6EeOwQstt3pSj0Q/6 ExtendedTypesTestsProfile.profile.uml#_4fuMcXk6EeOwQstt3pSj0Q http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5 ExtendedTypesTestsProfile.profile.uml#_3cRIAHkREeOwQstt3pSj0Q">
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ExtendedTypesTestsProfile="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7" xmlns:ExtendedTypesTestsProfile_1="http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7 ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5 ExtendedTypesTestsProfile.profile.uml#_3cRIAHkREeOwQstt3pSj0Q">
<uml:Model xmi:id="_X66aUf1VEd-WkaQf4YgINA" name="Model">
<packageImport xmi:type="uml:PackageImport" xmi:id="_X66aUv1VEd-WkaQf4YgINA">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
@@ -15,7 +15,7 @@
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_dj-KoGcFEeOea9k8XF7uAg">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dkH7oGcFEeOea9k8XF7uAg" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="ExtendedTypesTestsProfile.profile.uml#_4fuMcXk6EeOwQstt3pSj0Q"/>
+ <references xmi:type="ecore:EPackage" href="ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ"/>
</eAnnotations>
<appliedProfile xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>
</profileApplication>

Back to the top