Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations40
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations21
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java39
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations22
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations22
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations21
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java9
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java93
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java36
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java36
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project24
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties1
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java5
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java20
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF13
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml12
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java16
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore14
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram47
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml13
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java16
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java100
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java34
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java26
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java40
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java30
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java87
-rw-r--r--plugins/infra/types/pom.xml2
52 files changed, 409 insertions, 538 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
index 1452ff83fdc..24cc73c692c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation
-Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
index e5574351b22..2a3be97f39a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.infra.emf.types,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
index ea2d92d93e0..4879ece84f7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.emf.types</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
index daef8b50399..d22382a55a0 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
@@ -1,35 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.elementTypeSet"
- name="Infra-EMF"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <elementTypeConfigurations
- xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
- xmi:id="_H1ejUPvzEeWw0r4E4rSXyw"
- identifier="org.eclipse.papyrus.infra.emf.page"
- name="EObject"
- hint="EObject"
- editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper">
- <eClass
- href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.emf.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="Infra-EMF" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper" hint="EObject" identifier="org.eclipse.papyrus.infra.emf.page" name="EObject" xmi:id="_H1ejUPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
+ <eClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
</elementTypeConfigurations>
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"/>
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice" identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice" inheritance="all" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice" identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 134a924bbfc..32b56b70010 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -62,7 +62,7 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.sync;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-Vendor: %providerName
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations
index fab8b64c560..02c3f0e8554 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations
@@ -1,18 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.gmfdiag.common.elementTypeSet"
- name="GMFDiagCommon"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.gmfdiag.common.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="GMFDiagCommon" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" identifier="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
index 0d813f220da..2219425490f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
<elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
<eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>
</elementTypeConfigurations>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
index 1923421b102..8a03c87f595 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
import org.eclipse.gmf.runtime.emf.type.core.IEditHelperContext;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
@@ -344,31 +345,43 @@ public class DefaultEditHelper extends AbstractNotifierEditHelper {
}
if (advices == null) {
-
if (editHelperContext instanceof EObject) {
- // IElementType type = ElementTypeRegistry.getInstance().getElementType((EObject) editHelperContext, req.getClientContext());
- // advices = CacheRegistry.getInstance().getEditHelperAdvice(req.getClientContext(), type);
advices = ElementTypeRegistry.getInstance().getEditHelperAdvice((EObject) editHelperContext, req.getClientContext());
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) editHelperContext, req.getClientContext());
+ Arrays.sort(advices, new AdviceComparator(types, req.getClientContext().getId()));
} else if (editHelperContext instanceof IElementType) {
advices = CacheRegistry.getInstance().getEditHelperAdvice(req.getClientContext(), ((IElementType) editHelperContext));
+ Arrays.sort(advices, new AdviceComparator((IElementType) editHelperContext, req.getClientContext().getId()));
} else if (editHelperContext instanceof IEditHelperContext) {
- IElementType type = ((IEditHelperContext) editHelperContext).getElementType();
- if (type != null) {
- advices = CacheRegistry.getInstance().getEditHelperAdvice(req.getClientContext(), type);
+ IClientContext clientContext = ((IEditHelperContext) editHelperContext).getClientContext();
+ IElementType elementType = ((IEditHelperContext) editHelperContext).getElementType();
+ EObject eObject = ((IEditHelperContext) editHelperContext).getEObject();
+
+ if (clientContext != null) {
+ if (elementType != null) {
+ advices = CacheRegistry.getInstance().getEditHelperAdvice(req.getClientContext(), elementType);
+ Arrays.sort(advices, new AdviceComparator(elementType, req.getClientContext().getId()));
+ } else if (eObject != null) {
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(eObject, req.getClientContext());
+ advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(editHelperContext);
+ Arrays.sort(advices, new AdviceComparator(types, req.getClientContext().getId()));
+
+ }
} else {
- advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(editHelperContext);
+ if (elementType != null) {
+ advices = CacheRegistry.getInstance().getEditHelperAdvice(req.getClientContext(), elementType);
+ Arrays.sort(advices, new AdviceComparator(elementType, req.getClientContext().getId()));
+ } else if (eObject != null) {
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(eObject, req.getClientContext());
+ advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(editHelperContext);
+ Arrays.sort(advices, new AdviceComparator(types, req.getClientContext().getId()));
+ }
}
- } else {
- advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(editHelperContext);
}
}
- if (null != advices) {
- Arrays.sort(advices, new AdviceComparator(req.getClientContext().getId()));
- }
-
return advices;
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 7d13976b58b..d5685a971a8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[2.0.0,3.0.0)
org.eclipse.papyrus.infra.emf.nattable;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
index bc1658629bd..7bba16a0894 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet"
- name="NattableCommon"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="NattableCommon" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 3d900ab09a8..7b6296634c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -63,7 +63,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
index f30cf816786..1e233063ea3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet"
- name="TableContents"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="TableContents" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
index 1d25137fdb8..737b082ab00 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet"
- name="TableContext"
- metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model" name="TableContext" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index 4715b2dd387..03a66ee9175 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibili
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.4.0.qualifier
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
index 7c9da0844f7..f8b3d0e9573 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.services.controlmode.elementTypeSet"
- name="ControlMode"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.services.controlmode.helper.advice.ControlModeEditHelperAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.services.controlmode.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="ControlMode" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.controlmode.helper.advice.ControlModeEditHelperAdvice" identifier="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
index 2ae07e88ee4..4e9983f8ce9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
@@ -1,18 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.services.edit.marker.elementTypeSet"
- name="Marker"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.services.edit.marker.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="Marker" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice" identifier="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
index 47cfc243342..ef5175dfedf 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.infra.types.core,
org.eclipse.papyrus.infra.types.core.extensionpoints,
org.eclipse.papyrus.infra.types.core.factories,
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.infra.types.core,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml
index c0037f2b170..a1fa9877516 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types.core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
index f790f9f6127..7c879d5fb6b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
@@ -26,6 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
import org.eclipse.papyrus.infra.types.core.Activator;
import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
@@ -65,13 +66,13 @@ public class SpecializationTypeFactory extends AbstractElementTypeConfigurationF
protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {
// Specialized elementTypes
- List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypesID().size());
- for (String specializedTypeId : (elementTypeConfiguration).getSpecializedTypesID()) {
- IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);
+ List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypes().size());
+ for (ElementTypeConfiguration specializedTypeConfiguration : (elementTypeConfiguration).getSpecializedTypes()) {
+ IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeConfiguration.getIdentifier());
if (specializedType != null) {
specializedTypes.add(specializedType);
} else {
- Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeId + "\"");
+ Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeConfiguration + "\"");
}
}
IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
index 5a02f86a778..75358b03489 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
@@ -20,6 +20,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -27,13 +28,14 @@ import java.util.Set;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.util.Diagnostician;
import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeUtil;
@@ -67,7 +69,7 @@ public class ElementTypeSetConfigurationRegistry {
protected Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = null;
/** Advice execution order dependencies per clientContextId per IElementType */
- protected Map<String, OrientedGraph<String>> advicesDeps = null;
+ protected Map<String, Map<String, OrientedGraph<String>>> advicesDeps = null;
/** unique resource set to load all elementType sets models */
@@ -93,7 +95,7 @@ public class ElementTypeSetConfigurationRegistry {
// 0. Resets values
elementTypeSetConfigurationResourceSet = null;
elementTypeSetConfigurations = new HashMap<String, Map<String, ElementTypeSetConfiguration>>();
- advicesDeps = new HashMap<String, OrientedGraph<String>>();
+ advicesDeps = new HashMap<String, Map<String, OrientedGraph<String>>>();
// 1. creates the resource set
elementTypeSetConfigurationResourceSet = createResourceSet();
// 2. creates the list only when registry is acceded for the first time,
@@ -167,11 +169,16 @@ public class ElementTypeSetConfigurationRegistry {
return loadElementTypeSetConfigurations(clientContextID, Collections.singleton(elementTypeSetConfiguration));
}
- public OrientedGraph<String> getAdvicesDeps(String clientContextID) {
- OrientedGraph<String> dependencies = advicesDeps.get(clientContextID);
+ public OrientedGraph<String> getAdvicesDeps(String elementTypeID, String clientContextID) {
+ Map<String, OrientedGraph<String>> allDependencies = advicesDeps.get(clientContextID);
+ if (allDependencies == null) {
+ allDependencies = new HashMap<String, OrientedGraph<String>>();
+ advicesDeps.put(clientContextID, allDependencies);
+ }
+ OrientedGraph<String> dependencies = allDependencies.get(elementTypeID);
if (dependencies == null) {
dependencies = new OrientedGraph<String>();
- advicesDeps.put(clientContextID, dependencies);
+ allDependencies.put(elementTypeID, dependencies);
}
return dependencies;
}
@@ -180,9 +187,9 @@ public class ElementTypeSetConfigurationRegistry {
if (ElementTypeRegistry.getInstance().getType(elementTypeID) != null) {
if (!elementTypeID.equals(NullElementType.ID)) {
if (ElementTypeRegistryUtils.getType(context, elementTypeID) == null) {
- // The elementType is already existing but not binded yet
+ // The elementType is already existing but not bound yet
context.bindId(elementTypeID);
- Activator.log.info(elementTypeID + " is already registred elementtype but it is not binded yet. It has been binded to Papyrus context. ");
+ Activator.log.info(elementTypeID + " is already registred elementtype but it is not bound yet. It has been bound to Papyrus context. ");
}
}
return true;
@@ -199,20 +206,14 @@ public class ElementTypeSetConfigurationRegistry {
if (elementTypeConfiguration instanceof SpecializationTypeConfiguration) {
// First, check if dependencies are registered
- for (String specializedTypeId : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID()) {
+ for (ElementTypeConfiguration specializedTypeConfiguration : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypes()) {
- if (!isAlreadyRegistred(specializedTypeId, context)) {
+ if (!isAlreadyRegistred(specializedTypeConfiguration.getIdentifier(), context)) {
// try to register the dependency
- ElementTypeConfiguration specializedTypeConfiguration = elementTypeConfigurationsDefinitions.get(specializedTypeId);
if (specializedTypeConfiguration != null) {
boolean registred = registerElementTypeConfiguration(specializedTypeConfiguration, elementTypeConfigurationsDefinitions, context);
if (!registred) {
- Activator.log.info("Failed to register " + specializedTypeId);
- return false;
- }
- } else {
- if (!specializedTypeId.equals(NullElementType.ID)) {
- Activator.log.info("Cannot find ElementTypeConfiguration for " + specializedTypeId);
+ Activator.log.info("Failed to register " + specializedTypeConfiguration);
return false;
}
}
@@ -242,6 +243,8 @@ public class ElementTypeSetConfigurationRegistry {
}
}
+ Activator.log.info("Couldn't create ElementType from: " + elementTypeConfiguration);
+
return false;
}
@@ -261,8 +264,6 @@ public class ElementTypeSetConfigurationRegistry {
Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions = new HashMap<String, ElementTypeConfiguration>();
-
-
// Read from elementTypeSetConfigurations
Set<ElementTypeSetConfiguration> registrableElementTypeSetConfiguration = new HashSet<ElementTypeSetConfiguration>();
for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurationsToRegister) {
@@ -270,13 +271,28 @@ public class ElementTypeSetConfigurationRegistry {
Activator.log.warn("The collection of elementTypesconfigurations contains a null value. Loading aborted. ");
return false;
}
- // Check if not already registered
- if (elementTypeSetConfigurations.containsKey(elementTypeSetConfiguration.getIdentifier())) {
- Activator.log.warn("The following ElementTypesSetConfiguration has been ignored because the same ID already registreted: " + elementTypeSetConfiguration.getIdentifier());
+
+ Diagnostic diagnostic = Diagnostician.INSTANCE.validate(elementTypeSetConfiguration);
+ if (diagnostic.getSeverity() != Diagnostic.ERROR) {
+ // Check if not already registered
+ if (elementTypeSetConfigurations.containsKey(elementTypeSetConfiguration.getIdentifier())) {
+ Activator.log.warn("The following ElementTypesSetConfiguration has been ignored because the same ID already registreted: " + elementTypeSetConfiguration.getIdentifier());
+ } else {
+ registrableElementTypeSetConfiguration.add(elementTypeSetConfiguration);
+ for (ElementTypeConfiguration elementTypeConfiguration : elementTypeSetConfiguration.getElementTypeConfigurations()) {
+ elementTypeConfigurationsDefinitions.put(elementTypeConfiguration.getIdentifier(), elementTypeConfiguration);
+ }
+ }
} else {
- registrableElementTypeSetConfiguration.add(elementTypeSetConfiguration);
- for (ElementTypeConfiguration elementTypeConfiguration : elementTypeSetConfiguration.getElementTypeConfigurations()) {
- elementTypeConfigurationsDefinitions.put(elementTypeConfiguration.getIdentifier(), elementTypeConfiguration);
+ Activator.log.warn(diagnostic.getMessage());
+ Iterator<Diagnostic> it = diagnostic.getChildren().iterator();
+ while (it.hasNext()) {
+ Diagnostic childDiagnostic = (Diagnostic) it.next();
+ switch (childDiagnostic.getSeverity()) {
+ case Diagnostic.ERROR:
+ case Diagnostic.WARNING:
+ Activator.log.warn("\t" + childDiagnostic.getMessage());
+ }
}
}
}
@@ -306,7 +322,7 @@ public class ElementTypeSetConfigurationRegistry {
for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
while (it.hasNext()) {
- EObject element = it.next();
+ EObject element = (EObject) it.next();
if (element instanceof AdviceConfiguration) {
adviceToCheck.add((AdviceConfiguration) element);
}
@@ -318,7 +334,7 @@ public class ElementTypeSetConfigurationRegistry {
for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
while (it.hasNext()) {
- EObject element = it.next();
+ EObject element = (EObject) it.next();
if (element instanceof AdviceConfiguration) {
adviceToCheck.add((AdviceConfiguration) element);
@@ -327,11 +343,13 @@ public class ElementTypeSetConfigurationRegistry {
}
// Check that there is no cyclic dependencies among advices introduced by this loading
- OrientedGraph<String> deps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(adviceToCheck);
- Collection<Collection<Object>> cyclesAdvices = TypesConfigurationsCycleUtil.getCyclesInAdvices(deps.getVertices(), deps.getEdges());
- if (!cyclesAdvices.isEmpty()) {
- Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependencies in the Advices definitions: " + cyclesAdvices);
- return false;
+ Map<String, OrientedGraph<String>> deps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(adviceToCheck);
+ for (String type : deps.keySet()) {
+ Collection<Collection<Object>> cyclesAdvices = TypesConfigurationsCycleUtil.getCyclesInAdvices(deps.get(type).getVertices(), deps.get(type).getEdges());
+ if (!cyclesAdvices.isEmpty()) {
+ Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependencies in the Advices definitions: " + cyclesAdvices);
+ return false;
+ }
}
// If we reached that point, we should be able to register safely the none already registered elementTypeSets
@@ -421,14 +439,14 @@ public class ElementTypeSetConfigurationRegistry {
for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
while (it.hasNext()) {
- EObject element = it.next();
+ EObject element = (EObject) it.next();
if (element instanceof AdviceConfiguration) {
advices.add((AdviceConfiguration) element);
}
}
}
- OrientedGraph<String> deps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(advices);
+ Map<String, OrientedGraph<String>> deps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(advices);
advicesDeps.put(contextId, deps);
return true;
@@ -464,7 +482,7 @@ public class ElementTypeSetConfigurationRegistry {
if (Platform.inDebugMode()) {
Activator.log.debug("[Reading extension point]");
Activator.log.debug("- Path to the model: " + modelPath);
- Activator.log.debug("- ClientContext the model should be registreted to: " + clientContextId);
+ Activator.log.debug("- ClientContext the model will be registreted to: " + clientContextId);
Activator.log.debug("- id of the container bundle: " + contributorID);
}
ElementTypeSetConfiguration set = getElementTypeSetConfiguration(modelPath, contributorID);
@@ -571,11 +589,6 @@ public class ElementTypeSetConfigurationRegistry {
protected ResourceSet createResourceSet() {
ResourceSet set = new ResourceSetImpl();
- // Bug 488674 - Safe load and disable the URI to HTTP connection
- set.getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);
- set.getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);
- set.getLoadOptions().put(XMLResource.OPTION_USE_PACKAGE_NS_URI_AS_LOCATION, Boolean.FALSE);
-
return set;
}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
index 43bbcc5f2f8..277dfe0476c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
@@ -13,19 +13,30 @@
package org.eclipse.papyrus.infra.types.core.utils;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Comparator;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
public class AdviceComparator implements Comparator<IEditHelperAdvice> {
- protected OrientedGraph<String> dependencies;
+ protected Collection<OrientedGraph<String>> dependencies;
- public AdviceComparator(String contextId) {
- this.dependencies = ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(contextId);
+ public AdviceComparator(IElementType[] types, String contextId) {
+ this.dependencies = new ArrayList<OrientedGraph<String>>();
+ for (IElementType iElementType : types) {
+ this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(iElementType.getId(), contextId));
+ }
+ }
+
+ public AdviceComparator(IElementType elementType, String contextId) {
+ this.dependencies = new ArrayList<OrientedGraph<String>>();
+ this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(elementType.getId(), contextId));
}
@Override
@@ -33,16 +44,23 @@ public class AdviceComparator implements Comparator<IEditHelperAdvice> {
String arg0Name = arg0.getClass().getName();
String arg1Name = arg1.getClass().getName();
- if (dependencies.getEdges().containsKey(arg0Name)) {
- if (dependencies.getAllConnex(arg0Name).contains(arg1Name)) {
- return -1;
+
+ for (OrientedGraph<String> orientedGraph : dependencies) {
+ if (orientedGraph.getEdges().containsKey(arg0Name)) {
+ if (orientedGraph.getAllConnex(arg0Name).contains(arg1Name)) {
+ return -1;
+ }
}
}
- if (dependencies.getEdges().containsKey(arg1Name)) {
- if (dependencies.getAllConnex(arg1Name).contains(arg0Name)) {
- return 1;
+
+ for (OrientedGraph<String> orientedGraph : dependencies) {
+ if (orientedGraph.getEdges().containsKey(arg1Name)) {
+ if (orientedGraph.getAllConnex(arg1Name).contains(arg0Name)) {
+ return 1;
+ }
}
}
+
return 0;
}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
index 7ea83f59f05..2988a0b59a7 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
@@ -13,7 +13,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
import org.eclipse.papyrus.infra.types.AdviceConfiguration;
import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.types.core.Activator;
import org.eclipse.papyrus.infra.types.core.registries.AdviceConfigurationTypeRegistry;
//Implements Tarjan's strongly connected components algorithm
@@ -65,32 +64,31 @@ public class TypesConfigurationsCycleUtil {
}
}
- static public OrientedGraph<String> getDependenciesAmongAdvices(Collection<AdviceConfiguration> adviceConfigurations) {
- OrientedGraph<String> adviceDependencies = new OrientedGraph<String>();
+ static public Map<String, OrientedGraph<String>> getDependenciesAmongAdvices(Collection<AdviceConfiguration> adviceConfigurations) {
+ Map<String, OrientedGraph<String>> adviceDependencies = new HashMap<String, OrientedGraph<String>>();
for (AdviceConfiguration adviceConfiguration : adviceConfigurations) {
IAdviceBindingDescriptor descriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(adviceConfiguration);
+ String type = descriptor.getTypeId();
+
String currentAdviceConfigurationClassName = descriptor.getEditHelperAdvice().getClass().getName();
// Add current to the vertices
- adviceDependencies.addVertex(currentAdviceConfigurationClassName);
+ if (!adviceDependencies.containsKey(type)) {
+ adviceDependencies.put(type, new OrientedGraph<String>());
+ }
+ OrientedGraph<String> deps = adviceDependencies.get(type);
+ deps.addVertex(currentAdviceConfigurationClassName);
// Add dependencies vertices
- for (String after : adviceConfiguration.getAfter()) {
- if (after == null) {
- Activator.log.warn("The following AdviceConfiguration has ill-defined after : " + adviceConfiguration);
- break;
- }
- adviceDependencies.addEdge(currentAdviceConfigurationClassName, after);
+ for (AdviceConfiguration after : adviceConfiguration.getAfter()) {
+ IAdviceBindingDescriptor descriptorAfter = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(after);
+ deps.addEdge(currentAdviceConfigurationClassName, descriptorAfter.getEditHelperAdvice().getClass().getName());
}
- for (String before : adviceConfiguration.getBefore()) {
- if (before == null) {
- Activator.log.warn("The following AdviceConfiguration has ill-defined before : " + adviceConfiguration);
- break;
- }
- adviceDependencies.addEdge(before, currentAdviceConfigurationClassName);
+ for (AdviceConfiguration before : adviceConfiguration.getBefore()) {
+ IAdviceBindingDescriptor descriptorBefore = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(before);
+ deps.addEdge(descriptorBefore.getEditHelperAdvice().getClass().getName(), currentAdviceConfigurationClassName);
}
-
}
return adviceDependencies;
@@ -112,8 +110,8 @@ public class TypesConfigurationsCycleUtil {
// Add dependencies vertices
if (elementTypeConfiguration instanceof SpecializationTypeConfiguration) {
- for (String specializedTypeID : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID()) {
- elementTypeDependencies.addEdge(currentElementTypeID, specializedTypeID);
+ for (ElementTypeConfiguration specializedType : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypes()) {
+ elementTypeDependencies.addEdge(currentElementTypeID, specializedType.getIdentifier());
}
}
}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project
index d392a422fc0..b3b0ebb6e79 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project
@@ -20,33 +20,9 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>check.maven.pom</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>ignore.lower.bound.dependency.ranges</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF
index ccae9f27e4c..1b8567b1d38 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF
@@ -1,13 +1,12 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.types.provider
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
index 7c476126ebf..5fd7db611d3 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
@@ -88,3 +88,4 @@ _UI_OrderAdviceConfiguration_type = Order Advice Configuration
_UI_ExternallyRegisteredAdvice_type = Externally Registered Advice
_UI_OrderAdviceConfiguration_before_feature = Before
_UI_OrderAdviceConfiguration_after_feature = After
+_UI_SpecializationTypeConfiguration_specializedTypes_feature = Specialized Types
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml
index abbee0eae5a..e70971ee23d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types.edit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
index 6e9d6625c87..2a83ad6f2a8 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
@@ -137,7 +137,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends ItemProvider
true,
false,
false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
null,
null));
}
@@ -159,7 +159,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends ItemProvider
true,
false,
false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
null,
null));
}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java
index 3da90ce3b16..475de066957 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.infra.types.AdviceConfiguration;
import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
@@ -76,7 +75,7 @@ public class AdviceConfigurationItemProvider extends ConfigurationElementItemPro
true,
false,
false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
null,
null));
}
@@ -98,7 +97,7 @@ public class AdviceConfigurationItemProvider extends ConfigurationElementItemPro
true,
false,
false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
null,
null));
}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
index 971d3ee9336..8fdb8d2b6ba 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
@@ -58,29 +57,29 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addSpecializedTypesIDPropertyDescriptor(object);
+ addSpecializedTypesPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Specialized Types ID feature.
+ * This adds a property descriptor for the Specialized Types feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addSpecializedTypesIDPropertyDescriptor(Object object) {
+ protected void addSpecializedTypesPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_SpecializationTypeConfiguration_specializedTypesID_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_SpecializationTypeConfiguration_specializedTypesID_feature", "_UI_SpecializationTypeConfiguration_type"),
- ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID,
+ getString("_UI_SpecializationTypeConfiguration_specializedTypes_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_SpecializationTypeConfiguration_specializedTypes_feature", "_UI_SpecializationTypeConfiguration_type"),
+ ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES,
true,
false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ true,
+ null,
null,
null));
}
@@ -155,9 +154,6 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
updateChildren(notification);
switch (notification.getFeatureID(SpecializationTypeConfiguration.class)) {
- case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF
index 94d9ccb0490..b445881cb31 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.types.presentation
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml
index 64753857bcd..c4f16a90710 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types.editor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
index 45e0dc25c3f..0312c4d0d4c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
@@ -1,8 +1,13 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.infra.types.rulebased,
org.eclipse.papyrus.infra.types.rulebased.core,
org.eclipse.papyrus.infra.types.rulebased.impl,
@@ -11,7 +16,7 @@ Export-Package: org.eclipse.papyrus.infra.types.rulebased,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
index 065b805a8f5..9d6f23c37ff 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.rules/rulebased" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="RuleBased" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.rules/rulebased" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="RuleBased" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
<adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" identifier="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" inheritance="all" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
<target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
</adviceBindingsConfigurations>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
index 70e4bd38fa9..2ea5a972e21 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
@@ -17,7 +17,7 @@ _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
_UI_PropertyDescriptor_description = The {0} of the {1}
-_UI_RuleBasedTypeConfiguration_type = Type Configuration
+_UI_RuleBasedTypeConfiguration_type = Rule Based Type Configuration
_UI_RuleConfiguration_type = Rule Configuration
_UI_CompositeRuleConfiguration_type = Composite Rule Configuration
_UI_NotRuleConfiguration_type = Not Rule Configuration
@@ -25,7 +25,7 @@ _UI_AndRuleConfiguration_type = And Rule Configuration
_UI_OrRuleConfiguration_type = Or Rule Configuration
_UI_Unknown_type = Object
_UI_Unknown_datatype= Value
-_UI_RuleBasedTypeConfiguration_ruleConfiguration_feature = Rule Configuration
+_UI_RuleBasedTypeConfiguration_ruleConfiguration_feature = Rule Based Rule Configuration
_UI_CompositeRuleConfiguration_composedRules_feature = Composed Rules
_UI_NotRuleConfiguration_composedRule_feature = Composed Rule
_UI_Unknown_feature = Unspecified
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
index 10d1e60363a..bda57118a85 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
@@ -4,23 +4,19 @@
<extension-point id="ruleKind" name="Rule Extension Point" schema="schema/ruleKind.exsd"/>
-
-
-
- <extension
- point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+ <extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
<elementTypeSet
clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
path="model/rulebased.elementtypesconfigurations">
</elementTypeSet>
</extension>
- <extension
- point="org.eclipse.papyrus.infra.types.core.elementTypeConfigurationKind">
+ <extension point="org.eclipse.papyrus.infra.types.core.elementTypeConfigurationKind">
<elementTypeConfigurationKind
configurationClass="org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration"
factoryClass="org.eclipse.papyrus.infra.types.rulebased.core.RuleElementTypeFactory">
</elementTypeConfigurationKind>
</extension>
+
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated RuleBased -->
<package
@@ -52,7 +48,7 @@
<extension point="org.eclipse.emf.edit.childCreationExtenders">
<!-- @generated RuleBased -->
<extender
- uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+ uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>
</extension>
</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml
index d69d153fc30..0ef900cac4d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types.rulebased</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
index 331b485f2b0..7e196dbf3aa 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
@@ -132,40 +132,40 @@ public interface RuleBasedPackage extends EPackage {
int RULE_BASED_TYPE_CONFIGURATION__ICON_ENTRY = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY;
/**
- * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+ * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RULE_BASED_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+ int RULE_BASED_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;
/**
- * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RULE_BASED_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;
+ int RULE_BASED_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;
/**
- * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RULE_BASED_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;
+ int RULE_BASED_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
/**
- * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Specialized Types</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RULE_BASED_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+ int RULE_BASED_TYPE_CONFIGURATION__SPECIALIZED_TYPES = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES;
/**
* The feature id for the '<em><b>Rule Configuration</b></em>' containment reference.
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF
index dcc4f11dc4e..750d1711fbe 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.infra.types.core.internal.ui;x-internal:=true,
org.eclipse.papyrus.infra.types.core.internal.ui.handlers;x-internal:=true
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml
index 0610d5744f2..f7ec2505a3f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types.ui</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
index 66b613ac051..9480ac8f30d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.types;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
index a51ef0bf353..5c2b96fff8f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="types" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="types" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
nsPrefix="elementtypesconfigurations">
<eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
<eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"
@@ -29,10 +29,10 @@
<eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"
eSuperTypes="#//ConfigurationElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="before" upperBound="-1"
+ eType="#//AdviceConfiguration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="after" upperBound="-1"
+ eType="#//AdviceConfiguration"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"
abstract="true" eSuperTypes="#//IdentifiedConfiguration #//AdviceConfiguration">
@@ -45,14 +45,14 @@
eType="#//InheritanceKind"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"
eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
eType="#//ContainerConfiguration" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="specializedTypes" upperBound="-1"
+ eType="#//ElementTypeConfiguration"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">
<eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram
index b425fb2786c..608c4721a13 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram
@@ -100,14 +100,6 @@
<children xmi:type="notation:Shape" xmi:id="_dZUZehQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_dZUZfBQSEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_dZUZfRQSEeSwyuAkiSG7MA" type="7001">
- <children xmi:type="notation:Node" xmi:id="_lcjhoBY3EeSSL_L7W7Ic3A" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_lcjhoRY3EeSSL_L7W7Ic3A"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_TCKh8BQeEeSwyuAkiSG7MA" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TCKh8RQeEeSwyuAkiSG7MA"/>
- </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_dZUZfhQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZfxQSEeSwyuAkiSG7MA"/>
</children>
@@ -146,10 +138,6 @@
<children xmi:type="notation:Shape" xmi:id="_r_7yoBQUEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_r_8ZsBQUEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZsRQUEeSwyuAkiSG7MA" type="7001">
- <children xmi:type="notation:Node" xmi:id="_dZgmsBQSEeSwyuAkiSG7MA" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_dZgmsRQSEeSwyuAkiSG7MA"/>
- </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_r_8ZshQUEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_r_8ZsxQUEeSwyuAkiSG7MA"/>
</children>
@@ -601,4 +589,39 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EkYlsv_HEeWiHbKc0-r4zg" points="[-45, -26, 141, 69]$[-121, -89, 65, 6]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sPawgP_HEeWiHbKc0-r4zg" id="(0.13274336283185842,0.8813559322033898)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_ECEA4B3FEeaOT4vRi2_N2Q" type="4002" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ECEn8B3FEeaOT4vRi2_N2Q" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ECEn8R3FEeaOT4vRi2_N2Q" x="-1" y="-22"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_ECFPAB3FEeaOT4vRi2_N2Q" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ECFPAR3FEeaOT4vRi2_N2Q" x="-12" y="-7"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_ECEA4R3FEeaOT4vRi2_N2Q" fontName="Segoe UI"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ECEA4h3FEeaOT4vRi2_N2Q" points="[65, -6, 65, -6]$[116, -6, 116, -6]$[116, 9, 116, 9]$[65, 9, 65, 9]"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_ECKHgB3FEeaOT4vRi2_N2Q" type="4002" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ECKHgx3FEeaOT4vRi2_N2Q" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ECKHhB3FEeaOT4vRi2_N2Q" x="15" y="27"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_ECKHhR3FEeaOT4vRi2_N2Q" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ECKHhh3FEeaOT4vRi2_N2Q" x="1" y="-7"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_ECKHgR3FEeaOT4vRi2_N2Q" fontName="Segoe UI"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ECKHgh3FEeaOT4vRi2_N2Q" points="[-3, 0, -64, 14]$[-103, 0, -164, 14]$[-103, -16, -164, -2]$[-3, -16, -64, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OitVIB3FEeaOT4vRi2_N2Q" id="(0.023255813953488372,0.7692307692307693)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_BoQWYENgEeay77YZlFOXVQ" type="4002" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
+ <children xmi:type="notation:DecorationNode" xmi:id="_BoSLkENgEeay77YZlFOXVQ" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BoSLkUNgEeay77YZlFOXVQ" x="-150" y="-51"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_BoSLkkNgEeay77YZlFOXVQ" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_BoSLk0NgEeay77YZlFOXVQ" x="14" y="-17"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_BoQWYUNgEeay77YZlFOXVQ" fontName="Segoe UI"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BoQWYkNgEeay77YZlFOXVQ" points="[-5, 0, 24, 489]$[-29, 0, 0, 489]$[-29, -451, 0, 38]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BobVgENgEeay77YZlFOXVQ" id="(0.02617801047120419,0.4406779661016949)"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml
index f7e32708f06..3129b3c4b68 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml
@@ -15,25 +15,18 @@
-->
<plugin>
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="elementtypesconfigurations"
- class="org.eclipse.papyrus.infra.types.resource.CustomElementTypesConfigurationsResourceFactoryImpl"/>
- </extension>
-
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated ElementTypesConfigurations -->
<package
- uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+ uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
class="org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage"
genModel="model/ElementTypesConfigurations.genmodel"/>
</extension>
<extension point="org.eclipse.emf.ecore.content_parser">
- <!-- @generated ElementTypesConfigurations -->
<parser
contentTypeIdentifier="org.eclipse.papyrus.infra.types"
- class="org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl"/>
+ class="org.eclipse.papyrus.infra.types.resource.CustomElementTypesConfigurationsResourceFactoryImpl"/>
</extension>
<extension point="org.eclipse.core.contenttype.contentTypes">
@@ -45,7 +38,7 @@
name="%_UI_ElementTypesConfigurations_content_type"
priority="normal">
<describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
- <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"/>
+ <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"/>
<parameter name="kind" value="xmi"/>
</describer>
</content-type>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml
index e23b7c23ca7..148d4ecf24c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.types</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java
index aed7b13abec..6f2c383aa19 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java
@@ -34,35 +34,35 @@ import org.eclipse.emf.common.util.EList;
public interface AdviceConfiguration extends ConfigurationElement {
/**
- * Returns the value of the '<em><b>Before</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
+ * Returns the value of the '<em><b>Before</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.types.AdviceConfiguration}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Before</em>' attribute list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Before</em>' attribute list.
+ * @return the value of the '<em>Before</em>' reference list.
* @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceConfiguration_Before()
* @model
* @generated
*/
- EList<String> getBefore();
+ EList<AdviceConfiguration> getBefore();
/**
- * Returns the value of the '<em><b>After</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
+ * Returns the value of the '<em><b>After</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.types.AdviceConfiguration}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>After</em>' attribute list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>After</em>' attribute list.
+ * @return the value of the '<em>After</em>' reference list.
* @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceConfiguration_After()
* @model
* @generated
*/
- EList<String> getAfter();
+ EList<AdviceConfiguration> getAfter();
} // AdviceConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
index 4c47e484afc..696ca8e006f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
@@ -49,7 +49,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1";
+ String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2";
/**
* The package namespace name.
@@ -370,7 +370,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ADVICE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -379,7 +379,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ADVICE_CONFIGURATION__BEFORE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -541,7 +541,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -550,7 +550,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -667,40 +667,40 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
/**
- * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+ * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+ int SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+ int SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 2;
+ int SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Specialized Types</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 3;
+ int SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Specialization Type Configuration</em>' class.
@@ -856,7 +856,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION = ADVICE_CONFIGURATION__DESCRIPTION;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -865,7 +865,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__BEFORE = ADVICE_CONFIGURATION__BEFORE;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -910,7 +910,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -919,7 +919,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int EDIT_HELPER_ADVICE_CONFIGURATION__BEFORE = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__BEFORE;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -982,7 +982,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ADVICE_BINDING_CONFIGURATION__DESCRIPTION = ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -991,7 +991,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ADVICE_BINDING_CONFIGURATION__BEFORE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1237,7 +1237,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int EXTERNALLY_REGISTERED_ADVICE__DESCRIPTION = ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
/**
- * The feature id for the '<em><b>Before</b></em>' attribute list.
+ * The feature id for the '<em><b>Before</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1246,7 +1246,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int EXTERNALLY_REGISTERED_ADVICE__BEFORE = ADVICE_BINDING_CONFIGURATION__BEFORE;
/**
- * The feature id for the '<em><b>After</b></em>' attribute list.
+ * The feature id for the '<em><b>After</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1488,26 +1488,26 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EClass getAdviceConfiguration();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore <em>Before</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore <em>Before</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Before</em>'.
+ * @return the meta object for the reference list '<em>Before</em>'.
* @see org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore()
* @see #getAdviceConfiguration()
* @generated
*/
- EAttribute getAdviceConfiguration_Before();
+ EReference getAdviceConfiguration_Before();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter <em>After</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter <em>After</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>After</em>'.
+ * @return the meta object for the reference list '<em>After</em>'.
* @see org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter()
* @see #getAdviceConfiguration()
* @generated
*/
- EAttribute getAdviceConfiguration_After();
+ EReference getAdviceConfiguration_After();
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
@@ -1574,17 +1574,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EClass getSpecializationTypeConfiguration();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.
- * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID()
- * @see #getSpecializationTypeConfiguration()
- * @generated
- */
- EAttribute getSpecializationTypeConfiguration_SpecializedTypesID();
-
- /**
* Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1618,6 +1607,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EReference getSpecializationTypeConfiguration_MatcherConfiguration();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypes <em>Specialized Types</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Specialized Types</em>'.
+ * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypes()
+ * @see #getSpecializationTypeConfiguration()
+ * @generated
+ */
+ EReference getSpecializationTypeConfiguration_SpecializedTypes();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration <em>Container Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1993,20 +1993,20 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EClass ADVICE_CONFIGURATION = eINSTANCE.getAdviceConfiguration();
/**
- * The meta object literal for the '<em><b>Before</b></em>' attribute list feature.
+ * The meta object literal for the '<em><b>Before</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute ADVICE_CONFIGURATION__BEFORE = eINSTANCE.getAdviceConfiguration_Before();
+ EReference ADVICE_CONFIGURATION__BEFORE = eINSTANCE.getAdviceConfiguration_Before();
/**
- * The meta object literal for the '<em><b>After</b></em>' attribute list feature.
+ * The meta object literal for the '<em><b>After</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute ADVICE_CONFIGURATION__AFTER = eINSTANCE.getAdviceConfiguration_After();
+ EReference ADVICE_CONFIGURATION__AFTER = eINSTANCE.getAdviceConfiguration_After();
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
@@ -2061,14 +2061,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EClass SPECIALIZATION_TYPE_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration();
/**
- * The meta object literal for the '<em><b>Specialized Types ID</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = eINSTANCE.getSpecializationTypeConfiguration_SpecializedTypesID();
-
- /**
* The meta object literal for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2093,6 +2085,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
EReference SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration_MatcherConfiguration();
/**
+ * The meta object literal for the '<em><b>Specialized Types</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES = eINSTANCE.getSpecializationTypeConfiguration_SpecializedTypes();
+
+ /**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
index c0203534569..e1e2dca6b1d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.common.util.EList;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypes <em>Specialized Types</em>}</li>
* </ul>
*
* @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration()
@@ -35,22 +35,6 @@ import org.eclipse.emf.common.util.EList;
*/
public interface SpecializationTypeConfiguration extends ElementTypeConfiguration {
/**
- * Returns the value of the '<em><b>Specialized Types ID</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Specialized Types ID</em>' attribute list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Specialized Types ID</em>' attribute list.
- * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_SpecializedTypesID()
- * @model required="true"
- * @generated
- */
- EList<String> getSpecializedTypesID();
-
- /**
* Returns the value of the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
* It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
* <!-- begin-user-doc -->
@@ -130,4 +114,20 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
*/
void setMatcherConfiguration(AbstractMatcherConfiguration value);
+ /**
+ * Returns the value of the '<em><b>Specialized Types</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Specialized Types</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Specialized Types</em>' reference list.
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_SpecializedTypes()
+ * @model
+ * @generated
+ */
+ EList<ElementTypeConfiguration> getSpecializedTypes();
+
} // SpecializationTypeConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
index 90a82e8ee81..d8b652e2cf9 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
import org.eclipse.papyrus.infra.types.AdviceConfiguration;
@@ -95,24 +95,24 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObj
protected String description = DESCRIPTION_EDEFAULT;
/**
- * The cached value of the '{@link #getBefore() <em>Before</em>}' attribute list.
+ * The cached value of the '{@link #getBefore() <em>Before</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getBefore()
* @generated
* @ordered
*/
- protected EList<String> before;
+ protected EList<AdviceConfiguration> before;
/**
- * The cached value of the '{@link #getAfter() <em>After</em>}' attribute list.
+ * The cached value of the '{@link #getAfter() <em>After</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getAfter()
* @generated
* @ordered
*/
- protected EList<String> after;
+ protected EList<AdviceConfiguration> after;
/**
* The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
@@ -230,9 +230,9 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObj
* <!-- end-user-doc -->
* @generated
*/
- public EList<String> getBefore() {
+ public EList<AdviceConfiguration> getBefore() {
if (before == null) {
- before = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE);
+ before = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE);
}
return before;
}
@@ -242,9 +242,9 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObj
* <!-- end-user-doc -->
* @generated
*/
- public EList<String> getAfter() {
+ public EList<AdviceConfiguration> getAfter() {
if (after == null) {
- after = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER);
+ after = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER);
}
return after;
}
@@ -456,11 +456,11 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObj
return;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE:
getBefore().clear();
- getBefore().addAll((Collection<? extends String>)newValue);
+ getBefore().addAll((Collection<? extends AdviceConfiguration>)newValue);
return;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER:
getAfter().clear();
- getAfter().addAll((Collection<? extends String>)newValue);
+ getAfter().addAll((Collection<? extends AdviceConfiguration>)newValue);
return;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
setTarget((ElementTypeConfiguration)newValue);
@@ -602,10 +602,6 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObj
result.append(identifier);
result.append(", description: ");
result.append(description);
- result.append(", before: ");
- result.append(before);
- result.append(", after: ");
- result.append(after);
result.append(", inheritance: ");
result.append(inheritance);
result.append(')');
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java
index 17e486b64d6..302b3414df2 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.types.impl;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.papyrus.infra.types.AdviceConfiguration;
import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
@@ -35,23 +35,23 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
*/
public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl implements AdviceConfiguration {
/**
- * The cached value of the '{@link #getBefore() <em>Before</em>}' attribute list.
+ * The cached value of the '{@link #getBefore() <em>Before</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getBefore()
* @generated
* @ordered
*/
- protected EList<String> before;
+ protected EList<AdviceConfiguration> before;
/**
- * The cached value of the '{@link #getAfter() <em>After</em>}' attribute list.
+ * The cached value of the '{@link #getAfter() <em>After</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getAfter()
* @generated
* @ordered
*/
- protected EList<String> after;
+ protected EList<AdviceConfiguration> after;
/**
* <!-- begin-user-doc -->
@@ -77,9 +77,9 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
* <!-- end-user-doc -->
* @generated
*/
- public EList<String> getBefore() {
+ public EList<AdviceConfiguration> getBefore() {
if (before == null) {
- before = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE);
+ before = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE);
}
return before;
}
@@ -89,9 +89,9 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
* <!-- end-user-doc -->
* @generated
*/
- public EList<String> getAfter() {
+ public EList<AdviceConfiguration> getAfter() {
if (after == null) {
- after = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER);
+ after = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER);
}
return after;
}
@@ -123,11 +123,11 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
switch (featureID) {
case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
getBefore().clear();
- getBefore().addAll((Collection<? extends String>)newValue);
+ getBefore().addAll((Collection<? extends AdviceConfiguration>)newValue);
return;
case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
getAfter().clear();
- getAfter().addAll((Collection<? extends String>)newValue);
+ getAfter().addAll((Collection<? extends AdviceConfiguration>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -167,22 +167,4 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (before: ");
- result.append(before);
- result.append(", after: ");
- result.append(after);
- result.append(')');
- return result.toString();
- }
-
} //AdviceConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
index 0c66a6011ab..ea2f2f9b949 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
@@ -383,8 +383,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getAdviceConfiguration_Before() {
- return (EAttribute)adviceConfigurationEClass.getEStructuralFeatures().get(0);
+ public EReference getAdviceConfiguration_Before() {
+ return (EReference)adviceConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -392,8 +392,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getAdviceConfiguration_After() {
- return (EAttribute)adviceConfigurationEClass.getEStructuralFeatures().get(1);
+ public EReference getAdviceConfiguration_After() {
+ return (EReference)adviceConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
@@ -455,8 +455,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getSpecializationTypeConfiguration_SpecializedTypesID() {
- return (EAttribute)specializationTypeConfigurationEClass.getEStructuralFeatures().get(0);
+ public EReference getSpecializationTypeConfiguration_EditHelperAdviceConfiguration() {
+ return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(0);
}
/**
@@ -464,7 +464,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EReference getSpecializationTypeConfiguration_EditHelperAdviceConfiguration() {
+ public EReference getSpecializationTypeConfiguration_ContainerConfiguration() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -473,7 +473,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EReference getSpecializationTypeConfiguration_ContainerConfiguration() {
+ public EReference getSpecializationTypeConfiguration_MatcherConfiguration() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(2);
}
@@ -482,7 +482,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
- public EReference getSpecializationTypeConfiguration_MatcherConfiguration() {
+ public EReference getSpecializationTypeConfiguration_SpecializedTypes() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(3);
}
@@ -723,8 +723,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
abstractMatcherConfigurationEClass = createEClass(ABSTRACT_MATCHER_CONFIGURATION);
adviceConfigurationEClass = createEClass(ADVICE_CONFIGURATION);
- createEAttribute(adviceConfigurationEClass, ADVICE_CONFIGURATION__BEFORE);
- createEAttribute(adviceConfigurationEClass, ADVICE_CONFIGURATION__AFTER);
+ createEReference(adviceConfigurationEClass, ADVICE_CONFIGURATION__BEFORE);
+ createEReference(adviceConfigurationEClass, ADVICE_CONFIGURATION__AFTER);
abstractAdviceBindingConfigurationEClass = createEClass(ABSTRACT_ADVICE_BINDING_CONFIGURATION);
createEReference(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET);
@@ -733,10 +733,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
createEAttribute(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE);
specializationTypeConfigurationEClass = createEClass(SPECIALIZATION_TYPE_CONFIGURATION);
- createEAttribute(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION);
createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION);
createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
+ createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES);
containerConfigurationEClass = createEClass(CONTAINER_CONFIGURATION);
createEReference(containerConfigurationEClass, CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION);
@@ -839,8 +839,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
initEClass(abstractMatcherConfigurationEClass, AbstractMatcherConfiguration.class, "AbstractMatcherConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(adviceConfigurationEClass, AdviceConfiguration.class, "AdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAdviceConfiguration_Before(), ecorePackage.getEString(), "before", null, 0, -1, AdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAdviceConfiguration_After(), ecorePackage.getEString(), "after", null, 0, -1, AdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getAdviceConfiguration_Before(), this.getAdviceConfiguration(), null, "before", null, 0, -1, AdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getAdviceConfiguration_After(), this.getAdviceConfiguration(), null, "after", null, 0, -1, AdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(abstractAdviceBindingConfigurationEClass, AbstractAdviceBindingConfiguration.class, "AbstractAdviceBindingConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAbstractAdviceBindingConfiguration_Target(), this.getElementTypeConfiguration(), null, "target", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -849,10 +849,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
initEAttribute(getAbstractAdviceBindingConfiguration_Inheritance(), this.getInheritanceKind(), "inheritance", null, 1, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(specializationTypeConfigurationEClass, SpecializationTypeConfiguration.class, "SpecializationTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSpecializationTypeConfiguration_SpecializedTypesID(), ecorePackage.getEString(), "specializedTypesID", null, 1, -1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration_Target(), "editHelperAdviceConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getSpecializationTypeConfiguration_ContainerConfiguration(), this.getContainerConfiguration(), null, "containerConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getSpecializationTypeConfiguration_MatcherConfiguration(), this.getAbstractMatcherConfiguration(), null, "matcherConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getSpecializationTypeConfiguration_SpecializedTypes(), this.getElementTypeConfiguration(), null, "specializedTypes", null, 0, -1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(containerConfigurationEClass, ContainerConfiguration.class, "ContainerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getContainerConfiguration_ContainerMatcherConfiguration(), this.getAbstractMatcherConfiguration(), null, "containerMatcherConfiguration", null, 0, 1, ContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
index f460c2960ef..11131a7fd1e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
@@ -23,12 +23,11 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
@@ -40,26 +39,16 @@ import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getSpecializedTypes <em>Specialized Types</em>}</li>
* </ul>
*
* @generated
*/
public class SpecializationTypeConfigurationImpl extends ElementTypeConfigurationImpl implements SpecializationTypeConfiguration {
/**
- * The cached value of the '{@link #getSpecializedTypesID() <em>Specialized Types ID</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSpecializedTypesID()
- * @generated
- * @ordered
- */
- protected EList<String> specializedTypesID;
-
- /**
* The cached value of the '{@link #getEditHelperAdviceConfiguration() <em>Edit Helper Advice Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -90,22 +79,22 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
protected AbstractMatcherConfiguration matcherConfiguration;
/**
+ * The cached value of the '{@link #getSpecializedTypes() <em>Specialized Types</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getSpecializedTypes()
* @generated
+ * @ordered
*/
- protected SpecializationTypeConfigurationImpl() {
- super();
- }
+ protected EList<ElementTypeConfiguration> specializedTypes;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- @Override
- protected EClass eStaticClass() {
- return ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION;
+ protected SpecializationTypeConfigurationImpl() {
+ super();
}
/**
@@ -113,11 +102,9 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
- public EList<String> getSpecializedTypesID() {
- if (specializedTypesID == null) {
- specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
- }
- return specializedTypesID;
+ @Override
+ protected EClass eStaticClass() {
+ return ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION;
}
/**
@@ -254,6 +241,18 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ public EList<ElementTypeConfiguration> getSpecializedTypes() {
+ if (specializedTypes == null) {
+ specializedTypes = new EObjectResolvingEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES);
+ }
+ return specializedTypes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
@@ -291,14 +290,14 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
- return getSpecializedTypesID();
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
return getEditHelperAdviceConfiguration();
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
return getContainerConfiguration();
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
return getMatcherConfiguration();
+ case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
+ return getSpecializedTypes();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -312,10 +311,6 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
- getSpecializedTypesID().clear();
- getSpecializedTypesID().addAll((Collection<? extends String>)newValue);
- return;
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
setEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)newValue);
return;
@@ -325,6 +320,10 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
return;
+ case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
+ getSpecializedTypes().clear();
+ getSpecializedTypes().addAll((Collection<? extends ElementTypeConfiguration>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -337,9 +336,6 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
- getSpecializedTypesID().clear();
- return;
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
setEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)null);
return;
@@ -349,6 +345,9 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
setMatcherConfiguration((AbstractMatcherConfiguration)null);
return;
+ case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
+ getSpecializedTypes().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -361,32 +360,16 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
- return specializedTypesID != null && !specializedTypesID.isEmpty();
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
return editHelperAdviceConfiguration != null;
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
return containerConfiguration != null;
case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
return matcherConfiguration != null;
+ case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
+ return specializedTypes != null && !specializedTypes.isEmpty();
}
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (specializedTypesID: ");
- result.append(specializedTypesID);
- result.append(')');
- return result.toString();
- }
-
} //SpecializationTypeConfigurationImpl
diff --git a/plugins/infra/types/pom.xml b/plugins/infra/types/pom.xml
index f9f460eff6e..38d8bcefc36 100644
--- a/plugins/infra/types/pom.xml
+++ b/plugins/infra/types/pom.xml
@@ -8,7 +8,7 @@
<artifactId>org.eclipse.papyrus.infra</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <name>Papyrus Infra Extended Element Types</name>
+ <name>Papyrus Infra Element Types Configurations</name>
<description>Plug-ins contributing model-driven types to the GMF Run-time Element-Types registry.</description>
<modules>

Back to the top