diff options
| author | Florian Noyrit | 2016-04-08 12:27:06 +0000 |
|---|---|---|
| committer | Florian Noyrit | 2016-04-12 17:18:06 +0000 |
| commit | 2a65e3ac03de61df7578cfacbb7c10fc2bfe39ad (patch) | |
| tree | 9308c3eb1c665e5080bf8ae6898083722edcc080 /plugins | |
| parent | 5f7e110b3bfb1fc1d917bd988a1b67c42e2c6ad1 (diff) | |
| download | org.eclipse.papyrus-2a65e3ac03de61df7578cfacbb7c10fc2bfe39ad.tar.gz org.eclipse.papyrus-2a65e3ac03de61df7578cfacbb7c10fc2bfe39ad.tar.xz org.eclipse.papyrus-2a65e3ac03de61df7578cfacbb7c10fc2bfe39ad.zip | |
Move elementtypes definitions that are not model-based to model-based.
Change-Id: Ie8ffcdd5571799ac8bc7793c9606befb06b19fa5
Diffstat (limited to 'plugins')
74 files changed, 2223 insertions, 1418 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties index 1dc054540dd..d39b76697e8 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties @@ -4,6 +4,8 @@ bin.includes = META-INF/,\ .,\
about.html,\
build.properties,\
- plugin.xml
+ plugin.xml,\
+ model/
src.includes = about.html,\
- schema/
+ schema/,\
+ model/
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 new file mode 100644 index 00000000000..daef8b50399 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations @@ -0,0 +1,35 @@ +<?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"/>
+ </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>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml index da851f5c7b3..de27f193cdc 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml @@ -19,42 +19,11 @@ <plugin>
<extension-point id="dependencyUpdateParticipant" name="Dependency Update Participants" schema="schema/dependencyUpdateParticipant.exsd"/>
<extension
- point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
- <metamodel
- nsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBinding
- class="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"
- id="org.eclipse.papyrus.infra.emf.deletePageAdvice"
- inheritance="all"
- typeId="*">
- </adviceBinding>
- <metamodelType
- eclass="EObject"
- edithelper="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper"
- id="org.eclipse.papyrus.infra.emf.page">
- </metamodelType>
- </metamodel>
- <metamodel
- nsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBinding
- id="org.eclipse.papyrus.infra.emf.readOnlyAdvice"
- class="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice"
- typeId="*"
- inheritance="none">
- </adviceBinding>
- </metamodel>
- </extension>
- <extension
- point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
- <binding
- context="org.eclipse.papyrus.infra.services.edit.TypeContext">
- <elementType
- ref="org.eclipse.papyrus.infra.emf.page">
- </elementType>
- <advice
- ref="org.eclipse.papyrus.infra.emf.deletePageAdvice">
- </advice>
- </binding>
+ point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+ <elementTypeSet
+ clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+ path="model/infra-emf.elementtypesconfigurations">
+ </elementTypeSet>
</extension>
</plugin>
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 new file mode 100644 index 00000000000..fab8b64c560 --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations @@ -0,0 +1,18 @@ +<?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>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml index bb6e319922c..42f55e09939 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml @@ -146,26 +146,7 @@ </extension> <!-- ElementType bindings for diagram duplication with paste command --> - <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/emf/2002/Ecore"> - <adviceBinding - class="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" - id="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" - inheritance="none" - typeId="*"> - </adviceBinding> - </metamodel> - </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - - <!-- Bindings declaration --> - <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <advice ref="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" /> - </binding> -</extension> <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester @@ -550,5 +531,12 @@ </dependsOn> </service> </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/gmfdiag-common.elementtypesconfigurations"> + </elementTypeSet> + </extension> </plugin> 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 4935197f4e9..0219f98b0a0 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 @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[2.0.0,3.0.0) org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, 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.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)" 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/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties index 33bbfa24829..9f6f241251f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties @@ -5,5 +5,7 @@ bin.includes = META-INF/,\ plugin.xml,\
OSGI-INF/,\
about.html,\
- icons/
-src.includes = about.html
+ icons/,\
+ model/
+src.includes = about.html,\
+ model/
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 new file mode 100644 index 00000000000..bc1658629bd --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations @@ -0,0 +1,19 @@ +<?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>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml index 516988756aa..2c10f8d75c4 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml @@ -130,26 +130,7 @@ </handler> </extension> <!-- ElementType bindings for table duplication with paste command --> - <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/emf/2002/Ecore"> - <adviceBinding - class="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" - id="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" - inheritance="all" - typeId="*"> - </adviceBinding> - </metamodel> - </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - - <!-- Bindings declaration --> - <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <advice ref="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" /> - </binding> -</extension> <extension point="org.eclipse.ui.commandImages"> <image @@ -290,4 +271,11 @@ </activeWhen> </handler> </extension> +<extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/nattable-common.elementtypesconfigurations"> + </elementTypeSet> +</extension> </plugin> 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 de6000b3d8f..f35b9b726ec 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 @@ -59,7 +59,8 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, 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.viewpoints.policy;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.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/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties index 15fddf58ac6..5bbead8ef1f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties @@ -6,5 +6,7 @@ bin.includes = META-INF/,\ icons/,\
about.html,\
OSGI-INF/,\
- schema/
-src.includes = about.html
+ schema/,\
+ model/
+src.includes = about.html,\
+ model/
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 new file mode 100644 index 00000000000..f30cf816786 --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations @@ -0,0 +1,19 @@ +<?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>
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 new file mode 100644 index 00000000000..1d25137fdb8 --- /dev/null +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations @@ -0,0 +1,19 @@ +<?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>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml index 484a0f7af3e..1c972229727 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml @@ -1013,28 +1013,8 @@ </context> </extension> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - - <metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore"> - - <!-- Generalizarion specific advices (remove inconsistent views when a Generalization is deleted --> - <adviceBinding id="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" - class="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper" - inheritance="all" typeId="*"> - </adviceBinding> - - </metamodel> -</extension> <!-- UML ElementType bindings to Papyrus shared IClientContext --> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - - <!-- Bindings declaration to shared IClientContext --> - <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <elementType ref="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper"/> - </binding> - -</extension> <extension point="org.eclipse.ui.commands"> <category @@ -1386,27 +1366,6 @@ provider="org.eclipse.papyrus.infra.nattable.provider.ProblemLabelProvider"> </labelProvider> </extension> - <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/papyrus/nattable/model"> - <adviceBinding - class="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice" - id="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" - inheritance="all" - typeId="*"> - </adviceBinding> - </metamodel> - </extension> - <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - <binding - context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <elementType - ref="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice"> - </elementType> - </binding> - </extension> <extension point="org.eclipse.ui.commandImages"> <image @@ -1775,4 +1734,18 @@ type="java.lang.Object"> </propertyTester> </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/nattable-tablecontents.elementtypesconfigurations"> + </elementTypeSet> + </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/nattable-tablecontext.elementtypesconfigurations"> + </elementTypeSet> + </extension> </plugin> 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 b832c883be6..8ed3b371f9b 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 @@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibili org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", 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.ui;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.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 new file mode 100644 index 00000000000..7c9da0844f7 --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations @@ -0,0 +1,19 @@ +<?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>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml index 21a1aaee0c4..0d3cd935be1 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml @@ -128,24 +128,10 @@ </menuContribution> </extension> <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - <binding - context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <advice - ref="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper"> - </advice> - </binding> - </extension> - <extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/emf/2002/Ecore"> - <adviceBinding - class="org.eclipse.papyrus.infra.services.controlmode.helper.advice.ControlModeEditHelperAdvice" - id="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper" - inheritance="all" - typeId="*"> - </adviceBinding> - </metamodel> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/controlmode.elementtypesconfigurations"> + </elementTypeSet> </extension> </plugin> 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 new file mode 100644 index 00000000000..2ae07e88ee4 --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations @@ -0,0 +1,18 @@ +<?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>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml index 99cd255a624..4c7c1fb072e 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml @@ -15,33 +15,17 @@ -->
<plugin>
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
- <!-- Papyrus single IClientContext declaration
- This context can only be used explicitely as its matcher always return false ( in order
- to avoid undesired activation and possible side effects)
- -->
- <clientContext id="org.eclipse.papyrus.infra.services.edit.TypeContext">
- <matcher class="org.eclipse.papyrus.infra.services.edit.internal.matcher.NoContextEnablementMatcher"/>
- </clientContext>
-
-</extension>
-
<extension
- point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
- <metamodel
- nsURI="http://www.eclipse.org/emf/2002/Ecore">
-
- <!-- Delete markers attached to objects being deleted. -->
- <adviceBinding
- id="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice"
- class="org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice"
- typeId="*"
- inheritance="none">
- </adviceBinding>
- </metamodel>
+ point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+ <clientContext
+ id="org.eclipse.papyrus.infra.services.edit.TypeContext">
+ <matcher
+ class="org.eclipse.papyrus.infra.services.edit.internal.matcher.NoContextEnablementMatcher">
+ </matcher>
+ </clientContext>
</extension>
+
<!-- Binds general (non-UML specific) advices
The notation dependant advice add a View deletion command for any View that references
@@ -73,7 +57,6 @@ <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />
<!-- Delete markers attached to objects being deleted. -->
- <advice ref="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" />
</binding>
<!--
@@ -98,6 +81,13 @@ </serviceFactory>
</extension>
+<extension
+ point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+ <elementTypeSet
+ clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+ path="model/marker.elementtypesconfigurations">
+ </elementTypeSet>
+</extension>
</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java index 1bb0959254d..2d39c7686c0 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java @@ -23,9 +23,15 @@ import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeR public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindingConfiguration> extends AbstractAdviceFactory<T> {
+ private final String ALL_TYPE_ID = "*";
+
@Override
protected String getTypeId(T adviceConfiguration) {
- return adviceConfiguration.getTarget().getIdentifier();
+ if (adviceConfiguration.getTarget() != null) {
+ return adviceConfiguration.getTarget().getIdentifier();
+ } else {
+ return ALL_TYPE_ID;
+ }
}
@Override
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java index 35bd5225e06..73bde8d1152 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java @@ -70,6 +70,7 @@ public class AdviceConfigurationTypeRegistry { // Register default interpretations adviceConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getEditHelperAdviceConfiguration().getInstanceTypeName(), new DefaultEditHelperAdviceFactory()); adviceConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getAdviceBindingConfiguration().getInstanceTypeName(), new DefaultAdviceBindingFactory()); + adviceConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getExternallyRegisteredAdvice().getInstanceTypeName(), new DefaultAdviceBindingFactory()); } public <T extends AdviceConfiguration> IEditHelperAdviceFactory<T> getFactory(AdviceConfiguration adviceConfiguration) { 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 65f8e6e4ac3..910d7aaabc5 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 @@ -46,6 +46,7 @@ import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration; import org.eclipse.papyrus.infra.types.AdviceConfiguration; import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration; +import org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice; import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration; import org.eclipse.papyrus.infra.types.core.Activator; import org.eclipse.papyrus.infra.types.core.extensionpoints.IElementTypeSetExtensionPoint; @@ -249,7 +250,7 @@ public class ElementTypeSetConfigurationRegistry { IClientContext context = ClientContextManager.getInstance().getClientContext(contexId); if (context == null) { - Activator.log.warn("contexId couldn't be found. Loading aborted. "); + Activator.log.warn("contexId couldn't be found. Loading aborted: " + contexId); return false; } @@ -345,9 +346,13 @@ public class ElementTypeSetConfigurationRegistry { for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) { List<AbstractAdviceBindingConfiguration> adviceBindingConfigurations = elementTypeSetConfiguration.getAdviceBindingsConfigurations(); for (AbstractAdviceBindingConfiguration adviceBindingConfiguration : adviceBindingConfigurations) { - IAdviceBindingDescriptor editHelperAdviceDecriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(adviceBindingConfiguration); - ElementTypeRegistryUtils.registerAdviceBinding(editHelperAdviceDecriptor); - context.bindId(editHelperAdviceDecriptor.getId()); + if (adviceBindingConfiguration instanceof ExternallyRegisteredAdvice) { + context.bindId(adviceBindingConfiguration.getIdentifier()); + } else { + IAdviceBindingDescriptor editHelperAdviceDecriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(adviceBindingConfiguration); + ElementTypeRegistryUtils.registerAdviceBinding(editHelperAdviceDecriptor); + context.bindId(editHelperAdviceDecriptor.getId()); + } } } diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ExternallyRegisteredAdvice.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ExternallyRegisteredAdvice.gif Binary files differnew file mode 100644 index 00000000000..5d3e311dc25 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ExternallyRegisteredAdvice.gif diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_ExternallyRegisteredType.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_ExternallyRegisteredType.gif Binary files differnew file mode 100644 index 00000000000..5d3e311dc25 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_ExternallyRegisteredType.gif diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredAdvice.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredAdvice.gif Binary files differnew file mode 100644 index 00000000000..5d3e311dc25 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredAdvice.gif diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredType.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredType.gif Binary files differnew file mode 100644 index 00000000000..5d3e311dc25 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ExternallyRegisteredType.gif 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 7a9ac74f45c..7c476126ebf 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 @@ -80,3 +80,11 @@ _UI_IdentifiedConfiguration_name_feature = Name _UI_ElementTypeConfiguration_name_feature = Name _UI_NamedConfiguration_type = Named Configuration _UI_NamedConfiguration_name_feature = Name +_UI_ElementTypeConfiguration_externallyRegistered_feature = Externally Registered +_UI_EternallyRegistered_type = Eternally Registered +_UI_ExternallyRegistered_type = Externally Registered +_UI_ExternallyRegisteredType_type = Externally Registered Type +_UI_OrderAdviceConfiguration_type = Order Advice Configuration +_UI_ExternallyRegisteredAdvice_type = Externally Registered Advice +_UI_OrderAdviceConfiguration_before_feature = Before +_UI_OrderAdviceConfiguration_after_feature = After 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 7494565c8e4..6e9d6625c87 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 @@ -19,11 +19,19 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration; @@ -36,7 +44,7 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; * <!-- end-user-doc --> * @generated */ -public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfigurationItemProvider { +public class AbstractAdviceBindingConfigurationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -59,6 +67,9 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig super.getPropertyDescriptors(object); addIdentifierPropertyDescriptor(object); + addDescriptionPropertyDescriptor(object); + addBeforePropertyDescriptor(object); + addAfterPropertyDescriptor(object); addTargetPropertyDescriptor(object); addInheritancePropertyDescriptor(object); } @@ -88,6 +99,72 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig } /** + * This adds a property descriptor for the Description feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addDescriptionPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ConfigurationElement_description_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_description_feature", "_UI_ConfigurationElement_type"), + ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__DESCRIPTION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Before feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addBeforePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AdviceConfiguration_before_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AdviceConfiguration_before_feature", "_UI_AdviceConfiguration_type"), + ElementTypesConfigurationsPackage.Literals.ADVICE_CONFIGURATION__BEFORE, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the After feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void addAfterPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AdviceConfiguration_after_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_AdviceConfiguration_after_feature", "_UI_AdviceConfiguration_type"), + ElementTypesConfigurationsPackage.Literals.ADVICE_CONFIGURATION__AFTER, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** * This adds a property descriptor for the Target feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -170,7 +247,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig */ @Override public String getText(Object object) { - String label = ((AbstractAdviceBindingConfiguration)object).getDescription(); + String label = ((AbstractAdviceBindingConfiguration)object).getIdentifier(); return label == null || label.length() == 0 ? getString("_UI_AbstractAdviceBindingConfiguration_type") : getString("_UI_AbstractAdviceBindingConfiguration_type") + " " + label; @@ -190,6 +267,9 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig switch (notification.getFeatureID(AbstractAdviceBindingConfiguration.class)) { case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; @@ -223,4 +303,15 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration())); } + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + } 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 6c04ba8a5a6..3da90ce3b16 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 @@ -18,12 +18,10 @@ import java.util.List; 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; diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java index 258f57d803b..22ff4ec8cc1 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java @@ -236,8 +236,18 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen newChildDescriptors.add (createChildParameter + (ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS, + ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredType())); + + newChildDescriptors.add + (createChildParameter (ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration())); + + newChildDescriptors.add + (createChildParameter + (ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, + ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredAdvice())); } } diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java index ef2a007e8a8..2bb2ba27de7 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java @@ -283,6 +283,52 @@ public class ElementTypesConfigurationsItemProviderAdapterFactory extends Elemen } /** + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredType} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ExternallyRegisteredTypeItemProvider externallyRegisteredTypeItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredType}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createExternallyRegisteredTypeAdapter() { + if (externallyRegisteredTypeItemProvider == null) { + externallyRegisteredTypeItemProvider = new ExternallyRegisteredTypeItemProvider(this); + } + + return externallyRegisteredTypeItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ExternallyRegisteredAdviceItemProvider externallyRegisteredAdviceItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createExternallyRegisteredAdviceAdapter() { + if (externallyRegisteredAdviceItemProvider == null) { + externallyRegisteredAdviceItemProvider = new ExternallyRegisteredAdviceItemProvider(this); + } + + return externallyRegisteredAdviceItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -416,6 +462,8 @@ public class ElementTypesConfigurationsItemProviderAdapterFactory extends Elemen if (editHelperAdviceConfigurationItemProvider != null) editHelperAdviceConfigurationItemProvider.dispose(); if (adviceBindingConfigurationItemProvider != null) adviceBindingConfigurationItemProvider.dispose(); if (matcherConfigurationItemProvider != null) matcherConfigurationItemProvider.dispose(); + if (externallyRegisteredTypeItemProvider != null) externallyRegisteredTypeItemProvider.dispose(); + if (externallyRegisteredAdviceItemProvider != null) externallyRegisteredAdviceItemProvider.dispose(); } } diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredAdviceItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredAdviceItemProvider.java new file mode 100644 index 00000000000..8a6e0f4e1f4 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredAdviceItemProvider.java @@ -0,0 +1,109 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; + +import org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class ExternallyRegisteredAdviceItemProvider extends AdviceBindingConfigurationItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ExternallyRegisteredAdviceItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This returns ExternallyRegisteredAdvice.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternallyRegisteredAdvice")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((ExternallyRegisteredAdvice)object).getIdentifier(); + return label == null || label.length() == 0 ? + getString("_UI_ExternallyRegisteredAdvice_type") : + getString("_UI_ExternallyRegisteredAdvice_type") + " " + label; + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java new file mode 100644 index 00000000000..860fe03b609 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java @@ -0,0 +1,109 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types.provider; + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; + +import org.eclipse.papyrus.infra.types.ExternallyRegisteredType; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ExternallyRegisteredType} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ +public class ExternallyRegisteredTypeItemProvider extends ElementTypeConfigurationItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ExternallyRegisteredTypeItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This returns ExternallyRegisteredType.gif. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternallyRegisteredType")); + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getText(Object object) { + String label = ((ExternallyRegisteredType)object).getName(); + return label == null || label.length() == 0 ? + getString("_UI_ExternallyRegisteredType_type") : + getString("_UI_ExternallyRegisteredType_type") + " " + label; + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 8f50c3bae44..00000000000 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding//model/ElementElementTypesConfigurations.ecore=UTF-8 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 af1a267a768..66b613ac051 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 @@ -12,5 +12,6 @@ Export-Package: org.eclipse.papyrus.infra.types, org.eclipse.papyrus.infra.types.resource, org.eclipse.papyrus.infra.types.util Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy 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 828a45c9596..a51ef0bf353 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 @@ -35,9 +35,8 @@ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"
- abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
- eType="#//ElementTypeConfiguration"/>
+ abstract="true" eSuperTypes="#//IdentifiedConfiguration #//AdviceConfiguration">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//ElementTypeConfiguration"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
eType="#//ContainerConfiguration" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
@@ -95,4 +94,6 @@ interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExternallyRegisteredType" eSuperTypes="#//ElementTypeConfiguration"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ExternallyRegisteredAdvice" eSuperTypes="#//AdviceBindingConfiguration"/>
</ecore:EPackage>
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 c1344ecba16..b425fb2786c 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 @@ -4,7 +4,7 @@ <children xmi:type="notation:DecorationNode" xmi:id="_dZR9MhQSEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_dZR9MxQSEeSwyuAkiSG7MA" type="7001">
<children xmi:type="notation:Node" xmi:id="_LxebkBu-EeSI_rJGQSJeSQ" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_LxebkRu-EeSI_rJGQSJeSQ"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NBQSEeSwyuAkiSG7MA"/>
@@ -18,18 +18,18 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkQRQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkQhQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZR9MRQSEeSwyuAkiSG7MA" x="510" y="335"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_dZSkQxQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_dZSkRRQSEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_dZSkRhQSEeSwyuAkiSG7MA" type="7001">
<children xmi:type="notation:Node" xmi:id="_ok1poMpoEeWPW4wup-qMUw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_ok1pocpoEeWPW4wup-qMUw"/>
</children>
<children xmi:type="notation:Node" xmi:id="_ok7wQMpoEeWPW4wup-qMUw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_ok7wQcpoEeWPW4wup-qMUw"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_dZSkRxQSEeSwyuAkiSG7MA"/>
@@ -43,7 +43,7 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkTRQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkThQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZSkRBQSEeSwyuAkiSG7MA" x="315" y="610"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_dZTLUBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
@@ -60,7 +60,7 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLWhQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWxQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//IconEntry"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IconEntry"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTLURQSEeSwyuAkiSG7MA" x="40" y="590"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_dZTyYBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
@@ -77,7 +77,7 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyahQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaxQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ConfigurationElement"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ConfigurationElement"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTyYRQSEeSwyuAkiSG7MA" x="390" y="55"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_dZTybBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
@@ -94,18 +94,18 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZeBQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZeRQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTybRQSEeSwyuAkiSG7MA" x="990" y="870"/>
</children>
<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="ElementElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
+ <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="ElementElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
+ <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"/>
@@ -119,14 +119,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgxQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAhBQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AdviceConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZUZexQSEeSwyuAkiSG7MA" x="910" y="175"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_dZVnkBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_dZVnkhQSEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_dZVnkxQSEeSwyuAkiSG7MA" type="7001">
<children xmi:type="notation:Node" xmi:id="_z6xdkBfKEeShg7yWMgp7yA" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_z6xdkRfKEeShg7yWMgp7yA"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlBQSEeSwyuAkiSG7MA"/>
@@ -140,14 +140,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnmhQSEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmxQSEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="620"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="610"/>
</children>
<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="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>
+ <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"/>
@@ -161,7 +161,7 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwxQUEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AxBQUEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_r_7yoRQUEeSwyuAkiSG7MA" x="420" y="1110"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Rt13gBQXEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
@@ -178,14 +178,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FpBQXEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FpRQXEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ContainerConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ContainerConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rt13gRQXEeSwyuAkiSG7MA" x="555" y="870"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_-uCeQBQZEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_-uDFUBQZEeSwyuAkiSG7MA" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_-uDFURQZEeSwyuAkiSG7MA" type="7001">
<children xmi:type="notation:Node" xmi:id="_rBv9ABQdEeSwyuAkiSG7MA" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_rBv9ARQdEeSwyuAkiSG7MA"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_-uDFUhQZEeSwyuAkiSG7MA"/>
@@ -199,18 +199,18 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsZBQZEeSwyuAkiSG7MA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsZRQZEeSwyuAkiSG7MA"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCeQRQZEeSwyuAkiSG7MA" x="105" y="1115"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_18yYoBfKEeShg7yWMgp7yA" type="2005" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_18yYohfKEeShg7yWMgp7yA" type="5005"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_18yYoxfKEeShg7yWMgp7yA" type="7011">
<children xmi:type="notation:Node" xmi:id="_6FTtMBfKEeShg7yWMgp7yA" type="3009">
- <element xmi:type="ecore:EEnumLiteral" href="ElementElementTypesConfigurations.ecore#//InheritanceKind/all"/>
+ <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_6FTtMRfKEeShg7yWMgp7yA"/>
</children>
<children xmi:type="notation:Node" xmi:id="_7Ybh8BfKEeShg7yWMgp7yA" type="3009">
- <element xmi:type="ecore:EEnumLiteral" href="ElementElementTypesConfigurations.ecore#//InheritanceKind/none"/>
+ <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_7Ybh8RfKEeShg7yWMgp7yA"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_18yYpBfKEeShg7yWMgp7yA"/>
@@ -220,8 +220,8 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpxfKEeShg7yWMgp7yA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_18yYqBfKEeShg7yWMgp7yA"/>
</children>
- <element xmi:type="ecore:EEnum" href="ElementElementTypesConfigurations.ecore#//InheritanceKind"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1120" y="620"/>
+ <element xmi:type="ecore:EEnum" href="ElementTypesConfigurations.ecore#//InheritanceKind"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1125" y="605"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_KdlD4BgSEeSAXuG_wvLrDw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_KdlD4hgSEeSAXuG_wvLrDw" type="5001"/>
@@ -237,14 +237,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_Kdlq8RgSEeSAXuG_wvLrDw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_Kdlq8hgSEeSAXuG_wvLrDw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdlD4RgSEeSAXuG_wvLrDw" x="1375" y="650"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_1pGfMMi9EeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_1pHtUMi9EeWPvPHRj0_oqw" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_1pHtUci9EeWPvPHRj0_oqw" type="7001">
<children xmi:type="notation:Node" xmi:id="_kjFZcMi9EeWPvPHRj0_oqw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_kjFZcci9EeWPvPHRj0_oqw"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_1pHtUsi9EeWPvPHRj0_oqw"/>
@@ -258,14 +258,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtWMi9EeWPvPHRj0_oqw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtWci9EeWPvPHRj0_oqw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pGfMci9EeWPvPHRj0_oqw" x="1240" y="810"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_vzQJUMjBEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_vzQwYMjBEeWPvPHRj0_oqw" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_vzQwYcjBEeWPvPHRj0_oqw" type="7001">
<children xmi:type="notation:Node" xmi:id="_-VKBoMjDEeWPvPHRj0_oqw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_-VKBocjDEeWPvPHRj0_oqw"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_vzQwYsjBEeWPvPHRj0_oqw"/>
@@ -279,8 +279,8 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwaMjBEeWPvPHRj0_oqw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwacjBEeWPvPHRj0_oqw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="515" y="720"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="615" y="710"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_PI9n8MjCEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_PI-PAMjCEeWPvPHRj0_oqw" type="5001"/>
@@ -296,14 +296,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PCMjCEeWPvPHRj0_oqw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PCcjCEeWPvPHRj0_oqw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//MatcherConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MatcherConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PI9n8cjCEeWPvPHRj0_oqw" x="1120" y="1050"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_WLo7QMmYEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_WLo7QsmYEeWPvPHRj0_oqw" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_WLo7Q8mYEeWPvPHRj0_oqw" type="7001">
<children xmi:type="notation:Node" xmi:id="_SdpmlMmYEeWPvPHRj0_oqw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmlcmYEeWPvPHRj0_oqw"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_WLo7RMmYEeWPvPHRj0_oqw"/>
@@ -317,14 +317,14 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7SsmYEeWPvPHRj0_oqw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7S8mYEeWPvPHRj0_oqw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_WLo7QcmYEeWPvPHRj0_oqw" x="680" y="535"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_jQEu8MppEeWPW4wup-qMUw" type="2001" fontName="Segoe UI">
<children xmi:type="notation:DecorationNode" xmi:id="_jQF9EMppEeWPW4wup-qMUw" type="5001"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_jQGkIMppEeWPW4wup-qMUw" type="7001">
<children xmi:type="notation:Node" xmi:id="_SdpmkMmYEeWPvPHRj0_oqw" type="3001">
- <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
+ <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmkcmYEeWPvPHRj0_oqw"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_jQGkIcppEeWPW4wup-qMUw"/>
@@ -338,11 +338,45 @@ <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJ8ppEeWPW4wup-qMUw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkKMppEeWPW4wup-qMUw"/>
</children>
- <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//NamedConfiguration"/>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//NamedConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQEu8cppEeWPW4wup-qMUw" x="385" y="205"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_5az2IP2KEeWYtfYc864zmQ" type="2001" fontName="Segoe UI">
+ <children xmi:type="notation:DecorationNode" xmi:id="_5a1EQP2KEeWYtfYc864zmQ" type="5001"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_5a1EQf2KEeWYtfYc864zmQ" type="7001">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_5a1EQv2KEeWYtfYc864zmQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_5a1EQ_2KEeWYtfYc864zmQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_5a1ERP2KEeWYtfYc864zmQ" type="7002">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_5a1ERf2KEeWYtfYc864zmQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_5a1ERv2KEeWYtfYc864zmQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_5a1ER_2KEeWYtfYc864zmQ" type="7003">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_5a1ESP2KEeWYtfYc864zmQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_5a1ESf2KEeWYtfYc864zmQ"/>
+ </children>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ExternallyRegisteredType"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5az2If2KEeWYtfYc864zmQ" x="20" y="780"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3hAO8P_GEeWiHbKc0-r4zg" type="2001" fontName="Segoe UI">
+ <children xmi:type="notation:DecorationNode" xmi:id="_3hA2AP_GEeWiHbKc0-r4zg" type="5001"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_3hA2Af_GEeWiHbKc0-r4zg" type="7001">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_3hA2Av_GEeWiHbKc0-r4zg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_3hA2A__GEeWiHbKc0-r4zg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_3hA2BP_GEeWiHbKc0-r4zg" type="7002">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_3hA2Bf_GEeWiHbKc0-r4zg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_3hA2Bv_GEeWiHbKc0-r4zg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_3hA2B__GEeWiHbKc0-r4zg" type="7003">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_3hA2CP_GEeWiHbKc0-r4zg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_3hA2Cf_GEeWiHbKc0-r4zg"/>
+ </children>
+ <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ExternallyRegisteredAdvice"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3hAO8f_GEeWiHbKc0-r4zg" x="490" y="800"/>
+ </children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_abOYARQPEeSwyuAkiSG7MA"/>
- <element xmi:type="ecore:EPackage" href="ElementElementTypesConfigurations.ecore#/"/>
+ <element xmi:type="ecore:EPackage" href="ElementTypesConfigurations.ecore#/"/>
<edges xmi:type="notation:Connector" xmi:id="_daPmgBQSEeSwyuAkiSG7MA" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
<children xmi:type="notation:DecorationNode" xmi:id="_daPmgxQSEeSwyuAkiSG7MA" type="6002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhBQSEeSwyuAkiSG7MA" x="-9" y="-72"/>
@@ -351,7 +385,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhhQSEeSwyuAkiSG7MA" x="-5" y="-15"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_daPmgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daPmghQSEeSwyuAkiSG7MA" points="[0, 0, 234, -337]$[-204, 293, 30, -44]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXUxQSEeSwyuAkiSG7MA" id="(0.3333333333333333,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXVBQSEeSwyuAkiSG7MA" id="(0.8641975308641975,0.14666666666666667)"/>
@@ -377,7 +411,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kxQSEeSwyuAkiSG7MA" x="8" y="-23"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_daZXgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daZXghQSEeSwyuAkiSG7MA" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQhQSEeSwyuAkiSG7MA" id="(0.9135802469135802,0.14666666666666667)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQxQSEeSwyuAkiSG7MA" id="(0.032520325203252036,0.5333333333333333)"/>
@@ -394,17 +428,17 @@ <element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dagFMhQSEeSwyuAkiSG7MA" points="[-2, -52, 22, 626]$[-22, -619, 2, 59]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNBQSEeSwyuAkiSG7MA" id="(0.4971751412429379,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.37209302325581395,0.8266666666666667)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_s3NjcBQVEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
<children xmi:type="notation:DecorationNode" xmi:id="_s3NjcxQVEeSwyuAkiSG7MA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="-8" y="-64"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="47" y="-69"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_s3NjdRQVEeSwyuAkiSG7MA" type="6004">
<layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdhQVEeSwyuAkiSG7MA" x="-29" y="11"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_s3NjcRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3NjchQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BhqqsBfDEeShg7yWMgp7yA" id="(0.8705882352941177,0.8461538461538461)"/>
</edges>
@@ -421,7 +455,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cxQYEeSwyuAkiSG7MA" x="-35" y="13"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_hDfWYRQYEeSwyuAkiSG7MA" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hDfWYhQYEeSwyuAkiSG7MA" points="[-2, 4, 29, -100]$[-23, 75, 8, -29]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hDjn0BQYEeSwyuAkiSG7MA" id="(0.9529411764705882,0.6346153846153846)"/>
</edges>
@@ -440,23 +474,24 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNhgSEeSAXuG_wvLrDw" x="162" y="23"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_KdoHMRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdoHMhgSEeSAXuG_wvLrDw" points="[96, 0, -878, 463]$[974, 0, 0, 463]$[974, -437, 0, 26]"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Kdp8YBgSEeSAXuG_wvLrDw" type="4004" source="_KdlD4BgSEeSAXuG_wvLrDw" target="_dZUZehQSEeSwyuAkiSG7MA">
<styles xmi:type="notation:FontStyle" xmi:id="_Kdp8YRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kdp8YhgSEeSAXuG_wvLrDw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o54_IP_HEeWiHbKc0-r4zg" id="(0.627906976744186,0.7733333333333333)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_KGvBIBv3EeSyLpQry5wnWQ" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZVnkBQSEeSwyuAkiSG7MA">
<children xmi:type="notation:DecorationNode" xmi:id="_KGwPQBv3EeSyLpQry5wnWQ" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="18" y="-79"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="11" y="-92"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_KGwPQhv3EeSyLpQry5wnWQ" type="6004">
<layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQxv3EeSyLpQry5wnWQ" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_KGvBIRv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KGvBIhv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_KG2V4Bv3EeSyLpQry5wnWQ" type="4002" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
@@ -467,8 +502,9 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5hv3EeSyLpQry5wnWQ" x="40" y="-10"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_KG2V4Rv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KG2V4hv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1VRqsPtGEeWBLbCxWzTFGw" id="(0.0,0.559322033898305)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_QwLaUBv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">
<children xmi:type="notation:DecorationNode" xmi:id="_QwMBYBv3EeSyLpQry5wnWQ" type="6002">
@@ -478,7 +514,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYxv3EeSyLpQry5wnWQ" x="7" y="-14"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_QwLaURv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwLaUhv3EeSyLpQry5wnWQ" points="[25, -29, -127, 149]$[151, -152, -1, 26]"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_TqIqABv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
@@ -489,7 +525,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRExv3EeSyLpQry5wnWQ" x="49" y="13"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_TqIqARv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqIqAhv3EeSyLpQry5wnWQ" points="[7, -3, -434, 140]$[405, -129, -36, 14]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Bv3EeSyLpQry5wnWQ" id="(0.9633507853403142,0.22033898305084745)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Rv3EeSyLpQry5wnWQ" id="(0.27932960893854747,0.7627118644067796)"/>
@@ -517,7 +553,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxs8jMEeWPvPHRj0_oqw" x="-3" y="-14"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_46pKocjMEeWPvPHRj0_oqw" fontName="Segoe UI"/>
- <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
+ <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_46pKosjMEeWPvPHRj0_oqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Vx5MMjMEeWPvPHRj0_oqw" id="(0.9241379310344827,0.5576923076923077)"/>
</edges>
@@ -552,4 +588,17 @@ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oA4LgsppEeWPW4wup-qMUw" points="[0, -29, 116, 77]$[0, -59, 116, 47]$[-116, -59, 0, 47]$[-116, -100, 0, 6]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_85h1YMppEeWPW4wup-qMUw" id="(0.7424242424242424,0.8983050847457628)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_8u1LoP2KEeWYtfYc864zmQ" type="4004" source="_5az2IP2KEeWYtfYc864zmQ" target="_dZSkQxQSEeSwyuAkiSG7MA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_8u1Lof2KEeWYtfYc864zmQ" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8u1Lov2KEeWYtfYc864zmQ" points="[13, -12, -132, 113]$[112, -113, -33, 12]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8u-VkP2KEeWYtfYc864zmQ" id="(0.6083333333333333,0.23076923076923078)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8u-Vkf2KEeWYtfYc864zmQ" id="(0.2037037037037037,0.7466666666666667)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_EkYlsP_HEeWiHbKc0-r4zg" type="4004" source="_3hAO8P_GEeWiHbKc0-r4zg" target="_vzQJUMjBEeWPvPHRj0_oqw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_EkYlsf_HEeWiHbKc0-r4zg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <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>
</notation:Diagram>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel index 415da032cf6..78f01d33e4e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel @@ -80,5 +80,8 @@ <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//NamedConfiguration/name"/> </genClasses> + <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredType"/> + <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredAdvice" + labelFeature="#//types/IdentifiedConfiguration/identifier"/> </genPackages> </genmodel:GenModel> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java index 6809a81ffb5..abbf5a88917 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java @@ -32,7 +32,7 @@ package org.eclipse.papyrus.infra.types; * @model abstract="true" * @generated */ -public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration, IdentifiedConfiguration { +public interface AbstractAdviceBindingConfiguration extends IdentifiedConfiguration, AdviceConfiguration { /** * Returns the value of the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> @@ -44,7 +44,7 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration, * @return the value of the '<em>Target</em>' reference. * @see #setTarget(ElementTypeConfiguration) * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_Target() - * @model required="true" + * @model * @generated */ ElementTypeConfiguration getTarget(); 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 edcfa3ea072..aed7b13abec 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 @@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList; * @generated */ 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}. diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java index f0363fad6a4..39f674a738e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java @@ -104,6 +104,24 @@ public interface ElementTypesConfigurationsFactory extends EFactory { MatcherConfiguration createMatcherConfiguration(); /** + * Returns a new object of class '<em>Externally Registered Type</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Externally Registered Type</em>'. + * @generated + */ + ExternallyRegisteredType createExternallyRegisteredType(); + + /** + * Returns a new object of class '<em>Externally Registered Advice</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Externally Registered Advice</em>'. + * @generated + */ + ExternallyRegisteredAdvice createExternallyRegisteredAdvice(); + + /** * Returns the package supported by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> 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 52fef5f47b0..4c47e484afc 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 @@ -416,31 +416,111 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int ABSTRACT_ADVICE_BINDING_CONFIGURATION = 6; /** - * The feature id for the '<em><b>Description</b></em>' attribute. + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getSpecializationTypeConfiguration() + * @generated + */ + int SPECIALIZATION_TYPE_CONFIGURATION = 7; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getContainerConfiguration() + * @generated + */ + int CONTAINER_CONFIGURATION = 8; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMetamodelTypeConfiguration() + * @generated + */ + int METAMODEL_TYPE_CONFIGURATION = 9; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration() + * @generated + */ + int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = 10; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getEditHelperAdviceConfiguration() + * @generated + */ + int EDIT_HELPER_ADVICE_CONFIGURATION = 11; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceBindingConfiguration() + * @generated + */ + int ADVICE_BINDING_CONFIGURATION = 12; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMatcherConfiguration() + * @generated + */ + int MATCHER_CONFIGURATION = 13; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIdentifiedConfiguration() + * @generated + */ + int IDENTIFIED_CONFIGURATION = 14; + + /** + * The feature id for the '<em><b>Identifier</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION = ADVICE_CONFIGURATION__DESCRIPTION; + int IDENTIFIED_CONFIGURATION__IDENTIFIER = 0; /** - * The feature id for the '<em><b>Before</b></em>' attribute list. + * The number of structural features of the '<em>Identified Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE = ADVICE_CONFIGURATION__BEFORE; + int IDENTIFIED_CONFIGURATION_FEATURE_COUNT = 1; /** - * The feature id for the '<em><b>After</b></em>' attribute list. + * The number of operations of the '<em>Identified Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER = ADVICE_CONFIGURATION__AFTER; + int IDENTIFIED_CONFIGURATION_OPERATION_COUNT = 0; /** * The feature id for the '<em><b>Identifier</b></em>' attribute. @@ -449,71 +529,88 @@ public interface ElementTypesConfigurationsPackage extends EPackage { * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER = ADVICE_CONFIGURATION_FEATURE_COUNT + 0; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER = IDENTIFIED_CONFIGURATION__IDENTIFIER; /** - * The feature id for the '<em><b>Target</b></em>' reference. + * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET = ADVICE_CONFIGURATION_FEATURE_COUNT + 1; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Container Configuration</b></em>' containment reference. + * The feature id for the '<em><b>Before</b></em>' attribute list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION = ADVICE_CONFIGURATION_FEATURE_COUNT + 2; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference. + * The feature id for the '<em><b>After</b></em>' attribute list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION = ADVICE_CONFIGURATION_FEATURE_COUNT + 3; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Inheritance</b></em>' attribute. + * The feature id for the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE = ADVICE_CONFIGURATION_FEATURE_COUNT + 4; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 3; /** - * The number of structural features of the '<em>Abstract Advice Binding Configuration</em>' class. + * The feature id for the '<em><b>Container Configuration</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT = ADVICE_CONFIGURATION_FEATURE_COUNT + 5; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 4; /** - * The number of operations of the '<em>Abstract Advice Binding Configuration</em>' class. + * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT = ADVICE_CONFIGURATION_OPERATION_COUNT + 0; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class. + * The feature id for the '<em><b>Inheritance</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 6; + + /** + * The number of structural features of the '<em>Abstract Advice Binding Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getSpecializationTypeConfiguration() * @generated + * @ordered */ - int SPECIALIZATION_TYPE_CONFIGURATION = 7; + int ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT = IDENTIFIED_CONFIGURATION_FEATURE_COUNT + 7; + + /** + * The number of operations of the '<em>Abstract Advice Binding Configuration</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT = IDENTIFIED_CONFIGURATION_OPERATION_COUNT + 0; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -624,16 +721,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT = ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getContainerConfiguration() - * @generated - */ - int CONTAINER_CONFIGURATION = 8; - - /** * The feature id for the '<em><b>Container Matcher Configuration</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -670,16 +757,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int CONTAINER_CONFIGURATION_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMetamodelTypeConfiguration() - * @generated - */ - int METAMODEL_TYPE_CONFIGURATION = 9; - - /** * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -770,16 +847,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int METAMODEL_TYPE_CONFIGURATION_OPERATION_COUNT = ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration() - * @generated - */ - int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = 10; - - /** * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -834,16 +901,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT = ADVICE_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getEditHelperAdviceConfiguration() - * @generated - */ - int EDIT_HELPER_ADVICE_CONFIGURATION = 11; - - /** * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -907,14 +964,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class. + * The feature id for the '<em><b>Identifier</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceBindingConfiguration() * @generated + * @ordered */ - int ADVICE_BINDING_CONFIGURATION = 12; + int ADVICE_BINDING_CONFIGURATION__IDENTIFIER = ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER; /** * The feature id for the '<em><b>Description</b></em>' attribute. @@ -944,15 +1000,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int ADVICE_BINDING_CONFIGURATION__AFTER = ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER; /** - * The feature id for the '<em><b>Identifier</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ADVICE_BINDING_CONFIGURATION__IDENTIFIER = ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER; - - /** * The feature id for the '<em><b>Target</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1016,16 +1063,6 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT = ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMatcherConfiguration() - * @generated - */ - int MATCHER_CONFIGURATION = 13; - - /** * The feature id for the '<em><b>Matcher Class Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1053,51 +1090,69 @@ public interface ElementTypesConfigurationsPackage extends EPackage { int MATCHER_CONFIGURATION_OPERATION_COUNT = ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}' class. + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIdentifiedConfiguration() + * @see org.eclipse.papyrus.infra.types.NamedConfiguration + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getNamedConfiguration() * @generated */ - int IDENTIFIED_CONFIGURATION = 14; + int NAMED_CONFIGURATION = 15; /** - * The feature id for the '<em><b>Identifier</b></em>' attribute. + * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IDENTIFIED_CONFIGURATION__IDENTIFIER = 0; + int NAMED_CONFIGURATION__NAME = 0; /** - * The number of structural features of the '<em>Identified Configuration</em>' class. + * The number of structural features of the '<em>Named Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IDENTIFIED_CONFIGURATION_FEATURE_COUNT = 1; + int NAMED_CONFIGURATION_FEATURE_COUNT = 1; /** - * The number of operations of the '<em>Identified Configuration</em>' class. + * The number of operations of the '<em>Named Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int IDENTIFIED_CONFIGURATION_OPERATION_COUNT = 0; + int NAMED_CONFIGURATION_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}' class. + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredTypeImpl <em>Externally Registered Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.papyrus.infra.types.NamedConfiguration - * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getNamedConfiguration() + * @see org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredTypeImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredType() * @generated */ - int NAMED_CONFIGURATION = 15; + int EXTERNALLY_REGISTERED_TYPE = 16; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_TYPE__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Identifier</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_TYPE__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -1106,25 +1161,161 @@ public interface ElementTypesConfigurationsPackage extends EPackage { * @generated * @ordered */ - int NAMED_CONFIGURATION__NAME = 0; + int EXTERNALLY_REGISTERED_TYPE__NAME = ELEMENT_TYPE_CONFIGURATION__NAME; /** - * The number of structural features of the '<em>Named Configuration</em>' class. + * The feature id for the '<em><b>Hint</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int NAMED_CONFIGURATION_FEATURE_COUNT = 1; + int EXTERNALLY_REGISTERED_TYPE__HINT = ELEMENT_TYPE_CONFIGURATION__HINT; /** - * The number of operations of the '<em>Named Configuration</em>' class. + * The feature id for the '<em><b>Kind</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int NAMED_CONFIGURATION_OPERATION_COUNT = 0; + int EXTERNALLY_REGISTERED_TYPE__KIND = ELEMENT_TYPE_CONFIGURATION__KIND; + + /** + * The feature id for the '<em><b>Icon Entry</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_TYPE__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY; + + /** + * The number of structural features of the '<em>Externally Registered Type</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_TYPE_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0; + + /** + * The number of operations of the '<em>Externally Registered Type</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_TYPE_OPERATION_COUNT = ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredAdviceImpl <em>Externally Registered Advice</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredAdviceImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredAdvice() + * @generated + */ + int EXTERNALLY_REGISTERED_ADVICE = 17; + + /** + * The feature id for the '<em><b>Identifier</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__IDENTIFIER = ADVICE_BINDING_CONFIGURATION__IDENTIFIER; + + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__DESCRIPTION = ADVICE_BINDING_CONFIGURATION__DESCRIPTION; + + /** + * The feature id for the '<em><b>Before</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__BEFORE = ADVICE_BINDING_CONFIGURATION__BEFORE; + + /** + * The feature id for the '<em><b>After</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__AFTER = ADVICE_BINDING_CONFIGURATION__AFTER; + + /** + * The feature id for the '<em><b>Target</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__TARGET = ADVICE_BINDING_CONFIGURATION__TARGET; + + /** + * The feature id for the '<em><b>Container Configuration</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__CONTAINER_CONFIGURATION = ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION; + + /** + * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__MATCHER_CONFIGURATION = ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION; + + /** + * The feature id for the '<em><b>Inheritance</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__INHERITANCE = ADVICE_BINDING_CONFIGURATION__INHERITANCE; + + /** + * The feature id for the '<em><b>Edit Helper Advice Class Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE__EDIT_HELPER_ADVICE_CLASS_NAME = ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME; + + /** + * The number of structural features of the '<em>Externally Registered Advice</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE_FEATURE_COUNT = ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0; + + /** + * The number of operations of the '<em>Externally Registered Advice</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNALLY_REGISTERED_ADVICE_OPERATION_COUNT = ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}' enum. @@ -1134,7 +1325,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage { * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getInheritanceKind() * @generated */ - int INHERITANCE_KIND = 16; + int INHERITANCE_KIND = 18; /** @@ -1617,6 +1808,26 @@ public interface ElementTypesConfigurationsPackage extends EPackage { EAttribute getNamedConfiguration_Name(); /** + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ExternallyRegisteredType <em>Externally Registered Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Externally Registered Type</em>'. + * @see org.eclipse.papyrus.infra.types.ExternallyRegisteredType + * @generated + */ + EClass getExternallyRegisteredType(); + + /** + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice <em>Externally Registered Advice</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Externally Registered Advice</em>'. + * @see org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice + * @generated + */ + EClass getExternallyRegisteredAdvice(); + + /** * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2042,6 +2253,26 @@ public interface ElementTypesConfigurationsPackage extends EPackage { EAttribute NAMED_CONFIGURATION__NAME = eINSTANCE.getNamedConfiguration_Name(); /** + * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredTypeImpl <em>Externally Registered Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredTypeImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredType() + * @generated + */ + EClass EXTERNALLY_REGISTERED_TYPE = eINSTANCE.getExternallyRegisteredType(); + + /** + * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredAdviceImpl <em>Externally Registered Advice</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.papyrus.infra.types.impl.ExternallyRegisteredAdviceImpl + * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredAdvice() + * @generated + */ + EClass EXTERNALLY_REGISTERED_ADVICE = eINSTANCE.getExternallyRegisteredAdvice(); + + /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredAdvice.java new file mode 100644 index 00000000000..6d72d8bb27d --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredAdvice.java @@ -0,0 +1,27 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Externally Registered Advice</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getExternallyRegisteredAdvice() + * @model + * @generated + */ +public interface ExternallyRegisteredAdvice extends AdviceBindingConfiguration { +} // ExternallyRegisteredAdvice diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredType.java new file mode 100644 index 00000000000..8bbb9b67db9 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ExternallyRegisteredType.java @@ -0,0 +1,27 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Externally Registered Type</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getExternallyRegisteredType() + * @model + * @generated + */ +public interface ExternallyRegisteredType extends ElementTypeConfiguration { +} // ExternallyRegisteredType 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 ae8c40f72ff..90a82e8ee81 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 @@ -12,20 +12,25 @@ */ package org.eclipse.papyrus.infra.types.impl; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration; import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration; +import org.eclipse.papyrus.infra.types.AdviceConfiguration; +import org.eclipse.papyrus.infra.types.ConfigurationElement; 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.IdentifiedConfiguration; import org.eclipse.papyrus.infra.types.InheritanceKind; /** @@ -37,6 +42,9 @@ import org.eclipse.papyrus.infra.types.InheritanceKind; * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getIdentifier <em>Identifier</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getBefore <em>Before</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getAfter <em>After</em>}</li> * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getTarget <em>Target</em>}</li> * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li> * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li> @@ -45,7 +53,7 @@ import org.eclipse.papyrus.infra.types.InheritanceKind; * * @generated */ -public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfigurationImpl implements AbstractAdviceBindingConfiguration { +public abstract class AbstractAdviceBindingConfigurationImpl extends MinimalEObjectImpl.Container implements AbstractAdviceBindingConfiguration { /** * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute. * <!-- begin-user-doc --> @@ -67,6 +75,46 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi protected String identifier = IDENTIFIER_EDEFAULT; /** + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + + /** + * The cached value of the '{@link #getBefore() <em>Before</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getBefore() + * @generated + * @ordered + */ + protected EList<String> before; + + /** + * The cached value of the '{@link #getAfter() <em>After</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAfter() + * @generated + * @ordered + */ + protected EList<String> after; + + /** * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -161,6 +209,51 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi * <!-- end-user-doc --> * @generated */ + public String getDescription() { + return description; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setDescription(String newDescription) { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION, oldDescription, description)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<String> getBefore() { + if (before == null) { + before = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE); + } + return before; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<String> getAfter() { + if (after == null) { + after = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER); + } + return after; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public ElementTypeConfiguration getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -327,6 +420,12 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi switch (featureID) { case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: return getIdentifier(); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: + return getDescription(); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: + return getBefore(); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: + return getAfter(); case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET: if (resolve) return getTarget(); return basicGetTarget(); @@ -345,12 +444,24 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: setIdentifier((String)newValue); return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: + setDescription((String)newValue); + return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: + getBefore().clear(); + getBefore().addAll((Collection<? extends String>)newValue); + return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: + getAfter().clear(); + getAfter().addAll((Collection<? extends String>)newValue); + return; case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET: setTarget((ElementTypeConfiguration)newValue); return; @@ -378,6 +489,15 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: setIdentifier(IDENTIFIER_EDEFAULT); return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: + getBefore().clear(); + return; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: + getAfter().clear(); + return; case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET: setTarget((ElementTypeConfiguration)null); return; @@ -404,6 +524,12 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi switch (featureID) { case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: + return before != null && !before.isEmpty(); + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: + return after != null && !after.isEmpty(); case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET: return target != null; case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION: @@ -423,9 +549,16 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi */ @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == IdentifiedConfiguration.class) { + if (baseClass == ConfigurationElement.class) { + switch (derivedFeatureID) { + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION: return ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION; + default: return -1; + } + } + if (baseClass == AdviceConfiguration.class) { switch (derivedFeatureID) { - case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE: return ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE; + case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER: return ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER; default: return -1; } } @@ -439,9 +572,16 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi */ @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == IdentifiedConfiguration.class) { + if (baseClass == ConfigurationElement.class) { + switch (baseFeatureID) { + case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION: return ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION; + default: return -1; + } + } + if (baseClass == AdviceConfiguration.class) { switch (baseFeatureID) { - case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER; + case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE: return ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE; + case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER: return ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER; default: return -1; } } @@ -460,6 +600,12 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi StringBuffer result = new StringBuffer(super.toString()); result.append(" (identifier: "); 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 b03701761c6..17e486b64d6 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 @@ -13,13 +13,9 @@ 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.papyrus.infra.types.AdviceConfiguration; import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; @@ -47,7 +43,6 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i * @ordered */ protected EList<String> before; - /** * The cached value of the '{@link #getAfter() <em>After</em>}' attribute list. * <!-- begin-user-doc --> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java index 81814b16b0f..df06c29ae85 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java @@ -75,6 +75,8 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: return createEditHelperAdviceConfiguration(); case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION: return createAdviceBindingConfiguration(); case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION: return createMatcherConfiguration(); + case ElementTypesConfigurationsPackage.EXTERNALLY_REGISTERED_TYPE: return createExternallyRegisteredType(); + case ElementTypesConfigurationsPackage.EXTERNALLY_REGISTERED_ADVICE: return createExternallyRegisteredAdvice(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -195,6 +197,26 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen * <!-- end-user-doc --> * @generated */ + public ExternallyRegisteredType createExternallyRegisteredType() { + ExternallyRegisteredTypeImpl externallyRegisteredType = new ExternallyRegisteredTypeImpl(); + return externallyRegisteredType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ExternallyRegisteredAdvice createExternallyRegisteredAdvice() { + ExternallyRegisteredAdviceImpl externallyRegisteredAdvice = new ExternallyRegisteredAdviceImpl(); + return externallyRegisteredAdvice; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public InheritanceKind createInheritanceKindFromString(EDataType eDataType, String initialValue) { InheritanceKind result = InheritanceKind.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 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 98f75ed6fb8..0c66a6011ab 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 @@ -32,6 +32,8 @@ import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration; import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory; import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; +import org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice; +import org.eclipse.papyrus.infra.types.ExternallyRegisteredType; import org.eclipse.papyrus.infra.types.IconEntry; import org.eclipse.papyrus.infra.types.IdentifiedConfiguration; import org.eclipse.papyrus.infra.types.InheritanceKind; @@ -164,6 +166,20 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen * <!-- end-user-doc --> * @generated */ + private EClass externallyRegisteredTypeEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass externallyRegisteredAdviceEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EEnum inheritanceKindEEnum = null; /** @@ -637,6 +653,24 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen * <!-- end-user-doc --> * @generated */ + public EClass getExternallyRegisteredType() { + return externallyRegisteredTypeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getExternallyRegisteredAdvice() { + return externallyRegisteredAdviceEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EEnum getInheritanceKind() { return inheritanceKindEEnum; } @@ -730,6 +764,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen namedConfigurationEClass = createEClass(NAMED_CONFIGURATION); createEAttribute(namedConfigurationEClass, NAMED_CONFIGURATION__NAME); + externallyRegisteredTypeEClass = createEClass(EXTERNALLY_REGISTERED_TYPE); + + externallyRegisteredAdviceEClass = createEClass(EXTERNALLY_REGISTERED_ADVICE); + // Create enums inheritanceKindEEnum = createEEnum(INHERITANCE_KIND); } @@ -769,14 +807,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen elementTypeConfigurationEClass.getESuperTypes().add(this.getIdentifiedConfiguration()); elementTypeConfigurationEClass.getESuperTypes().add(this.getNamedConfiguration()); adviceConfigurationEClass.getESuperTypes().add(this.getConfigurationElement()); - abstractAdviceBindingConfigurationEClass.getESuperTypes().add(this.getAdviceConfiguration()); abstractAdviceBindingConfigurationEClass.getESuperTypes().add(this.getIdentifiedConfiguration()); + abstractAdviceBindingConfigurationEClass.getESuperTypes().add(this.getAdviceConfiguration()); specializationTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration()); metamodelTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration()); abstractEditHelperAdviceConfigurationEClass.getESuperTypes().add(this.getAdviceConfiguration()); editHelperAdviceConfigurationEClass.getESuperTypes().add(this.getAbstractEditHelperAdviceConfiguration()); adviceBindingConfigurationEClass.getESuperTypes().add(this.getAbstractAdviceBindingConfiguration()); matcherConfigurationEClass.getESuperTypes().add(this.getAbstractMatcherConfiguration()); + externallyRegisteredTypeEClass.getESuperTypes().add(this.getElementTypeConfiguration()); + externallyRegisteredAdviceEClass.getESuperTypes().add(this.getAdviceBindingConfiguration()); // Initialize classes, features, and operations; add parameters initEClass(elementTypeSetConfigurationEClass, ElementTypeSetConfiguration.class, "ElementTypeSetConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -803,7 +843,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen 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); initEClass(abstractAdviceBindingConfigurationEClass, AbstractAdviceBindingConfiguration.class, "AbstractAdviceBindingConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getAbstractAdviceBindingConfiguration_Target(), this.getElementTypeConfiguration(), null, "target", null, 1, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); initEReference(getAbstractAdviceBindingConfiguration_ContainerConfiguration(), this.getContainerConfiguration(), null, "containerConfiguration", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAbstractAdviceBindingConfiguration_MatcherConfiguration(), this.getAbstractMatcherConfiguration(), null, "matcherConfiguration", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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); @@ -840,6 +880,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen initEClass(namedConfigurationEClass, NamedConfiguration.class, "NamedConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getNamedConfiguration_Name(), ecorePackage.getEString(), "name", null, 1, 1, NamedConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(externallyRegisteredTypeEClass, ExternallyRegisteredType.class, "ExternallyRegisteredType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(externallyRegisteredAdviceEClass, ExternallyRegisteredAdvice.class, "ExternallyRegisteredAdvice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + // Initialize enums and add enum literals initEEnum(inheritanceKindEEnum, InheritanceKind.class, "InheritanceKind"); addEEnumLiteral(inheritanceKindEEnum, InheritanceKind.NONE); diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredAdviceImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredAdviceImpl.java new file mode 100644 index 00000000000..258b6fca6ea --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredAdviceImpl.java @@ -0,0 +1,47 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types.impl; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; +import org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Externally Registered Advice</b></em>'. + * <!-- end-user-doc --> + * + * @generated + */ +public class ExternallyRegisteredAdviceImpl extends AdviceBindingConfigurationImpl implements ExternallyRegisteredAdvice { + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ExternallyRegisteredAdviceImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return ElementTypesConfigurationsPackage.Literals.EXTERNALLY_REGISTERED_ADVICE; + } + +} //ExternallyRegisteredAdviceImpl diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredTypeImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredTypeImpl.java new file mode 100644 index 00000000000..fcdb3ce4e62 --- /dev/null +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ExternallyRegisteredTypeImpl.java @@ -0,0 +1,47 @@ +/** + * Copyright (c) 2014 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.infra.types.impl; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; +import org.eclipse.papyrus.infra.types.ExternallyRegisteredType; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Externally Registered Type</b></em>'. + * <!-- end-user-doc --> + * + * @generated + */ +public class ExternallyRegisteredTypeImpl extends ElementTypeConfigurationImpl implements ExternallyRegisteredType { + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ExternallyRegisteredTypeImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return ElementTypesConfigurationsPackage.Literals.EXTERNALLY_REGISTERED_TYPE; + } + +} //ExternallyRegisteredTypeImpl diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java index dd857a159c4..6a8b36ef56e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java @@ -142,6 +142,14 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl return createNamedConfigurationAdapter(); } @Override + public Adapter caseExternallyRegisteredType(ExternallyRegisteredType object) { + return createExternallyRegisteredTypeAdapter(); + } + @Override + public Adapter caseExternallyRegisteredAdvice(ExternallyRegisteredAdvice object) { + return createExternallyRegisteredAdviceAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -386,6 +394,34 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ExternallyRegisteredType <em>Externally Registered Type</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.types.ExternallyRegisteredType + * @generated + */ + public Adapter createExternallyRegisteredTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice <em>Externally Registered Advice</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.types.ExternallyRegisteredAdvice + * @generated + */ + public Adapter createExternallyRegisteredAdviceAdapter() { + return null; + } + + /** * Creates a new adapter for the default case. * <!-- begin-user-doc --> * This default implementation returns null. diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java index 479ec3bd9d1..de9ed4988c1 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java @@ -122,8 +122,8 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> { case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION: { AbstractAdviceBindingConfiguration abstractAdviceBindingConfiguration = (AbstractAdviceBindingConfiguration)theEObject; T result = caseAbstractAdviceBindingConfiguration(abstractAdviceBindingConfiguration); - if (result == null) result = caseAdviceConfiguration(abstractAdviceBindingConfiguration); if (result == null) result = caseIdentifiedConfiguration(abstractAdviceBindingConfiguration); + if (result == null) result = caseAdviceConfiguration(abstractAdviceBindingConfiguration); if (result == null) result = caseConfigurationElement(abstractAdviceBindingConfiguration); if (result == null) result = defaultCase(theEObject); return result; @@ -175,8 +175,8 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> { AdviceBindingConfiguration adviceBindingConfiguration = (AdviceBindingConfiguration)theEObject; T result = caseAdviceBindingConfiguration(adviceBindingConfiguration); if (result == null) result = caseAbstractAdviceBindingConfiguration(adviceBindingConfiguration); - if (result == null) result = caseAdviceConfiguration(adviceBindingConfiguration); if (result == null) result = caseIdentifiedConfiguration(adviceBindingConfiguration); + if (result == null) result = caseAdviceConfiguration(adviceBindingConfiguration); if (result == null) result = caseConfigurationElement(adviceBindingConfiguration); if (result == null) result = defaultCase(theEObject); return result; @@ -200,6 +200,27 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case ElementTypesConfigurationsPackage.EXTERNALLY_REGISTERED_TYPE: { + ExternallyRegisteredType externallyRegisteredType = (ExternallyRegisteredType)theEObject; + T result = caseExternallyRegisteredType(externallyRegisteredType); + if (result == null) result = caseElementTypeConfiguration(externallyRegisteredType); + if (result == null) result = caseConfigurationElement(externallyRegisteredType); + if (result == null) result = caseIdentifiedConfiguration(externallyRegisteredType); + if (result == null) result = caseNamedConfiguration(externallyRegisteredType); + if (result == null) result = defaultCase(theEObject); + return result; + } + case ElementTypesConfigurationsPackage.EXTERNALLY_REGISTERED_ADVICE: { + ExternallyRegisteredAdvice externallyRegisteredAdvice = (ExternallyRegisteredAdvice)theEObject; + T result = caseExternallyRegisteredAdvice(externallyRegisteredAdvice); + if (result == null) result = caseAdviceBindingConfiguration(externallyRegisteredAdvice); + if (result == null) result = caseAbstractAdviceBindingConfiguration(externallyRegisteredAdvice); + if (result == null) result = caseIdentifiedConfiguration(externallyRegisteredAdvice); + if (result == null) result = caseAdviceConfiguration(externallyRegisteredAdvice); + if (result == null) result = caseConfigurationElement(externallyRegisteredAdvice); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -445,6 +466,36 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Externally Registered Type</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Externally Registered Type</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseExternallyRegisteredType(ExternallyRegisteredType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Externally Registered Advice</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Externally Registered Advice</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseExternallyRegisteredAdvice(ExternallyRegisteredAdvice object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml index b7c08df7242..3a2f932086d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml @@ -3297,14 +3297,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]> path="model/activityDiagram.elementtypesconfigurations"> </elementTypeSet> </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types"> - <?gmfgen generated="false"?> - </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="false"?> - </extension> - <extension point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler"> <diagramReconciler diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations index 9c95ec67972..ce298fdb3cb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations @@ -1,9 +1,53 @@ <?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.uml.diagram.clazz.elementTypeSet" name="PapyrusUMLClassDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
- <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice">
- <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/>
+<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.uml.diagram.clazz.elementTypeSet"
+ name="PapyrusUMLClassDiagram"
+ metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ"
+ description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)"
+ identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice"
+ inheritance="all"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/>
</adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VPE3UJpvEeWZOI1l_xp4vg" description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice">
- <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA"/>
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_VPE3UJpvEeWZOI1l_xp4vg"
+ description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)"
+ identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice"
+ inheritance="all"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_46cVMPszEeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice"
+ inheritance="all"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.NamespaceHelperAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc6kDlYCEeS0WsAAtVmToA"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_P80rsPs0EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.ConstraintHelperAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC-1YCEeS0WsAAtVmToA"/>
</adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml index 44e0a641b91..d2c32cecc85 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml @@ -1258,29 +1258,6 @@ </decoratorProvider> </extension> -<!-- Diagram specific advices --> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.NamespaceHelperAdvice" - id="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice" - inheritance="all" - typeId="org.eclipse.papyrus.uml.Namespace"> - </adviceBinding> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.ConstraintHelperAdvice" - id="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice" - inheritance="none" - typeId="org.eclipse.papyrus.uml.Constraint"> - </adviceBinding> - - </metamodel> -</extension> - -<!-- UML ElementType bindings to Papyrus shared IClientContext --> - <extension point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders"> <contributionItemProvider @@ -1745,19 +1722,7 @@ target="1.2.0"> </diagramReconciler> </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.clazz.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.clazz.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.clazz.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> + <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders"> <?gmfgen generated="true"?> <visualTypeProvider diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations new file mode 100644 index 00000000000..eee928a129a --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations @@ -0,0 +1,20 @@ +<?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.uml.diagram.communication-notation.elementTypeSet"
+ name="PapyrusUMLCommunicationDiagram-Notation"
+ metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+ xmi:id="_3JRnoPs1EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Diagram_ShortcutShape"
+ name="%metatype.name.Diagram_ShortcutShape"
+ hint="Diagram_ShortcutShape">
+ <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
+ </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations new file mode 100644 index 00000000000..b3d3c3c8c3d --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations @@ -0,0 +1,32 @@ +<?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.uml.diagram.communication.custom.elementTypeSet"
+ name="PapyrusUMLCommunicationDiagramCustom"
+ metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_K2GhIPtCEeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.DestroyMessageAdvice"
+ inheritance="all"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.communication.custom.advices.DestroyMessageAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc59FFYCEeS0WsAAtVmToA"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations
+ xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
+ xmi:id="_fxIwoPtCEeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.MessageHelperAdvice"
+ inheritance="all"
+ editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.communication.custom.advices.MessageHelperAdvice">
+ <target
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc59FFYCEeS0WsAAtVmToA"/>
+ </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations new file mode 100644 index 00000000000..cba2f940a62 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations @@ -0,0 +1,124 @@ +<?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.uml.diagram.communication.elementTypeSet"
+ name="PapyrusUMLCommunicationDiagram"
+ metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_3JRnoPs1EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Package_CommunicationDiagram"
+ name="%metatype.name.Package_CommunicationDiagram"
+ hint="Package_CommunicationDiagram"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_OfI60Ps2EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Interaction_Shape"
+ name="%metatype.name.Interaction_Shape"
+ hint="Interaction_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_peTP8Ps2EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Lifeline_Shape"
+ name="%metatype.name.Lifeline_Shape"
+ hint="Lifeline_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_eWmGQPs3EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_Shape"
+ name="%metatype.name.Constraint_Shape"
+ hint="Constraint_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_yiSjgPs3EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_Shape"
+ name="%metatype.name.Comment_Shape"
+ hint="Comment_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_50OgEPs3EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape"
+ name="%metatype.name.TimeObservation_Shape"
+ hint="TimeObservation_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_WdaHAPs4EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape"
+ name="%metatype.name.DurationObservation_Shape"
+ hint="DurationObservation_Shape"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
+ xmi:id="_rQgigPs4EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Path_Edge"
+ name="%metatype.name.Path_Edge"
+ hint="Path_Edge"
+ editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper">
+ <eClass
+ href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+ xmi:id="_1I3HsPs4EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_AnnotatedElementEdge"
+ name="%metatype.name.Comment_AnnotatedElementEdge"
+ hint="Comment_AnnotatedElementEdge">
+ <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+ xmi:id="_M_e-kPs5EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_ConstrainedElementEdge"
+ name="%metatype.name.Constraint_ConstrainedElementEdge"
+ hint="Constraint_ConstrainedElementEdge">
+ <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+ xmi:id="_bQzvIPs5EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_EventEdge"
+ name="%metatype.name.DurationObservation_EventEdge"
+ hint="DurationObservation_EventEdge">
+ <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations
+ xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+ xmi:id="_k-kN4Ps5EeWBLbCxWzTFGw"
+ identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_EventEdge"
+ name="%metatype.name.TimeObservation_EventEdge"
+ hint="TimeObservation_EventEdge">
+ <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+ </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml index fceeda70852..df55efa42d2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml @@ -302,137 +302,7 @@ </ParserProvider> </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types"> - <?gmfgen generated="true"?> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Package_CommunicationDiagram" - name="%metatype.name.Package_CommunicationDiagram" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Package" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper"> - <param name="semanticHint" value="Package_CommunicationDiagram"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Interaction_Shape" - name="%metatype.name.Interaction_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Interaction" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper"> - <param name="semanticHint" value="Interaction_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Diagram_ShortcutShape" - name="%metatype.name.Diagram_ShortcutShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Diagram" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ShortCutDiagramEditHelper"> - <param name="semanticHint" value="Diagram_ShortcutShape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Lifeline_Shape" - name="%metatype.name.Lifeline_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Lifeline" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper"> - <param name="semanticHint" value="Lifeline_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Constraint_Shape" - name="%metatype.name.Constraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Constraint" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper"> - <param name="semanticHint" value="Constraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Comment_Shape" - name="%metatype.name.Comment_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Comment" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper"> - <param name="semanticHint" value="Comment_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape" - name="%metatype.name.TimeObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="TimeObservation" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper"> - <param name="semanticHint" value="TimeObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_Shape" - name="%metatype.name.DurationObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DurationObservation" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper"> - <param name="semanticHint" value="DurationObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.communication.Path_Edge" - name="%metatype.name.Path_Edge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Message" - edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper"> - <param name="semanticHint" value="Path_Edge"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.communication.Comment_AnnotatedElementEdge" - name="%metatype.name.Comment_AnnotatedElementEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Comment_AnnotatedElementEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.communication.Constraint_ConstrainedElementEdge" - name="%metatype.name.Constraint_ConstrainedElementEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Constraint_ConstrainedElementEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_EventEdge" - name="%metatype.name.DurationObservation_EventEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="DurationObservation_EventEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_EventEdge" - name="%metatype.name.TimeObservation_EventEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="TimeObservation_EventEdge"/> - </specializationType> - </metamodel> - </extension> - -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> + <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> <?gmfgen generated="true"?> <clientContext id="org.eclipse.papyrus.uml.diagram.communication.TypeContext"> <enablement> @@ -441,24 +311,9 @@ value="org.eclipse.papyrus.uml.diagram.communication.EditingDomain"/> </enablement> </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.communication.TypeContext"> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Package_CommunicationDiagram"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Interaction_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Diagram_ShortcutShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Lifeline_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Constraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Comment_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Path_Edge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Comment_AnnotatedElementEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Constraint_ConstrainedElementEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_EventEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_EventEdge"/> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> </extension> + <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput"> <?gmfgen generated="true"?> <propertyTester @@ -638,40 +493,6 @@ <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Path_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,DurationObservation_EventEdge,TimeObservation_EventEdge"/> </viewProvider> </extension> -<extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - <binding - context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <elementType - ref="org.eclipse.papyrus.uml.diagram.communication.MessageHelperAdvice"> - </elementType> - </binding> - <binding - context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <elementType - ref="org.eclipse.papyrus.uml.diagram.communication.DestroyMessageAdvice"> - </elementType> - </binding> -</extension> -<extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/uml2/3.0.0/UML"> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.communication.custom.advices.DestroyMessageAdvice" - id="org.eclipse.papyrus.uml.diagram.communication.DestroyMessageAdvice" - inheritance="all" - typeId="org.eclipse.papyrus.uml.Message"> - </adviceBinding> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.communication.custom.advices.MessageHelperAdvice" - id="org.eclipse.papyrus.uml.diagram.communication.MessageHelperAdvice" - inheritance="all" - typeId="org.eclipse.papyrus.uml.Message"> - </adviceBinding> - - </metamodel> -</extension> <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders"> <?gmfgen generated="true"?> <decoratorProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLValidationDecoratorProvider"> @@ -749,6 +570,27 @@ diagramType="PapyrusUMLCommunicationDiagram"> </visualTypeProvider> </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.uml.diagram.communication.TypeContext" + path="model/communicationdiagram.elementtypesconfigurations"> + </elementTypeSet> + </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.uml.diagram.communication.TypeContext" + path="model/communicationdiagram-notation.elementtypesconfigurations"> + </elementTypeSet> + </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/communicationdiagram-uml.elementtypesconfigurations"> + </elementTypeSet> + </extension> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml index 6022b3731d7..41ac754ab9a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml @@ -285,19 +285,6 @@ - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.component.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.component.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml index d5d12e417ac..6b79155194a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml @@ -953,19 +953,6 @@ </elementTypeSet> </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> <?gmfgen generated="true"?> <diagramMappings diagramID="CompositeStructure"> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml index 714a6b43f13..4381ba449e3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml @@ -566,19 +566,6 @@ </extension> -<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.deployment.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.deployment.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.deployment.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation"> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml index 72e53696793..ce02efec54c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml @@ -614,19 +614,6 @@ </editor> </paletteProvider> </extension> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.activity.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.activity.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.activity.TypeContext"> - <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/> - </binding> - </extension> <extension point="org.eclipse.ui.commands"> <command diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations new file mode 100644 index 00000000000..80fa57638b9 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations @@ -0,0 +1,17 @@ +<?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="_BJMa0PyeEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.uml.elementTypeSet" + name="PapyrusUMLSequenceDiagramUML" + metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <adviceBindingsConfigurations + xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" + xmi:id="_nL7yIPyeEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.viewDependences" + inheritance="all" + editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.sequence.SequenceViewDependentsAdvice"/> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations new file mode 100644 index 00000000000..c0cd61d8b75 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations @@ -0,0 +1,305 @@ +<?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="_jiZccPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.elementTypeSet" + name="PapyrusUMLSequenceDiagram" + metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZccfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Package_SequenceDiagram" + name="%metatype.name.Package_SequenceDiagram" + hint="Package_SequenceDiagram" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.PackageEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZccvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Interaction_Shape" + name="%metatype.name.Interaction_Shape" + hint="Interaction_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcc_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_Shape" + name="%metatype.name.ConsiderIgnoreFragment_Shape" + hint="ConsiderIgnoreFragment_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcdPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape" + name="%metatype.name.CombinedFragment_Shape" + hint="CombinedFragment_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CombinedFragmentEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcdfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_Shape" + name="%metatype.name.InteractionOperand_Shape" + hint="InteractionOperand_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionOperandEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcdvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_Shape" + name="%metatype.name.InteractionUse_Shape" + hint="InteractionUse_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionUseEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcd_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Continuation_Shape" + name="%metatype.name.Continuation_Shape" + hint="Continuation_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ContinuationEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcePyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Lifeline_Shape" + name="%metatype.name.Lifeline_Shape" + hint="Lifeline_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.LifelineEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcefyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_Shape" + name="%metatype.name.ActionExecutionSpecification_Shape" + hint="ActionExecutionSpecification_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZcevyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_Shape" + name="%metatype.name.BehaviorExecutionSpecification_Shape" + hint="BehaviorExecutionSpecification_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiZce_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_Shape" + name="%metatype.name.StateInvariant_Shape" + hint="StateInvariant_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.StateInvariantEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDgPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_CoRegionShape" + name="%metatype.name.CombinedFragment_CoRegionShape" + hint="CombinedFragment_CoRegionShape"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDgfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_Shape" + name="%metatype.name.TimeConstraint_Shape" + hint="TimeConstraint_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeConstraintEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDgvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_Shape" + name="%metatype.name.TimeObservation_Shape" + hint="TimeObservation_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeObservationEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDg_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape" + name="%metatype.name.DurationConstraint_Shape" + hint="DurationConstraint_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationConstraintEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDhPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.DestructionOccurrenceSpecification_Shape" + name="%metatype.name.DestructionOccurrenceSpecification_Shape" + hint="DestructionOccurrenceSpecification_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DestructionEventEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDhfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_Shape" + name="%metatype.name.Constraint_Shape" + hint="Constraint_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConstraintEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDhvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_Shape" + name="%metatype.name.Comment_Shape" + hint="Comment_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CommentEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDh_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape_CN" + name="%metatype.name.DurationConstraint_Shape_CN" + hint="DurationConstraint_Shape_CN"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDiPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_Shape" + name="%metatype.name.DurationObservation_Shape" + hint="DurationObservation_Shape" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationObservationEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDifyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge" + name="%metatype.name.Message_SynchEdge" + hint="Message_SynchEdge" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDivyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_AsynchEdge" + name="%metatype.name.Message_AsynchEdge" + hint="Message_AsynchEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDi_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_ReplyEdge" + name="%metatype.name.Message_ReplyEdge" + hint="Message_ReplyEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDjPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_CreateEdge" + name="%metatype.name.Message_CreateEdge" + hint="Message_CreateEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDjfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_DeleteEdge" + name="%metatype.name.Message_DeleteEdge" + hint="Message_DeleteEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDjvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_LostEdge" + name="%metatype.name.Message_LostEdge" + hint="Message_LostEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDj_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_FoundEdge" + name="%metatype.name.Message_FoundEdge" + hint="Message_FoundEdge"> + <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDkPyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_AnnotatedElementEdge" + name="%metatype.name.Comment_AnnotatedElementEdge" + hint="Comment_AnnotatedElementEdge"> + <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDkfyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ConstrainedElementEdge" + name="%metatype.name.Constraint_ConstrainedElementEdge" + hint="Constraint_ConstrainedElementEdge"> + <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" + xmi:id="_jiaDkvyaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_Edge" + name="%metatype.name.GeneralOrdering_Edge" + hint="GeneralOrdering_Edge" + editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.GeneralOrderingEditHelper"> + <eClass + href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/> + </elementTypeConfigurations> + <elementTypeConfigurations + xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" + xmi:id="_jiaDk_yaEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ContextEdge" + name="%metatype.name.Constraint_ContextEdge" + hint="Constraint_ContextEdge"> + <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID> + </elementTypeConfigurations> + <adviceBindingsConfigurations + xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" + xmi:id="_zpEy0PyfEeWbo9Y7g2MLdw" + identifier="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd" + inheritance="all" + editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice"/> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml index 25dc86993b5..b51ca644924 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml @@ -194,310 +194,7 @@ </ParserProvider> </extension> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types"> - <?gmfgen generated="true"?> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Package_SequenceDiagram" - name="%metatype.name.Package_SequenceDiagram" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Package" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.PackageEditHelper"> - <param name="semanticHint" value="Package_SequenceDiagram"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Interaction_Shape" - name="%metatype.name.Interaction_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Interaction" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionEditHelper"> - <param name="semanticHint" value="Interaction_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_Shape" - name="%metatype.name.ConsiderIgnoreFragment_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="ConsiderIgnoreFragment" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper"> - <param name="semanticHint" value="ConsiderIgnoreFragment_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape" - name="%metatype.name.CombinedFragment_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="CombinedFragment" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CombinedFragmentEditHelper"> - <param name="semanticHint" value="CombinedFragment_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_Shape" - name="%metatype.name.InteractionOperand_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="InteractionOperand" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionOperandEditHelper"> - <param name="semanticHint" value="InteractionOperand_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_Shape" - name="%metatype.name.InteractionUse_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="InteractionUse" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionUseEditHelper"> - <param name="semanticHint" value="InteractionUse_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Continuation_Shape" - name="%metatype.name.Continuation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Continuation" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ContinuationEditHelper"> - <param name="semanticHint" value="Continuation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Lifeline_Shape" - name="%metatype.name.Lifeline_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Lifeline" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.LifelineEditHelper"> - <param name="semanticHint" value="Lifeline_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_Shape" - name="%metatype.name.ActionExecutionSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="ActionExecutionSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper"> - <param name="semanticHint" value="ActionExecutionSpecification_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_Shape" - name="%metatype.name.BehaviorExecutionSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="BehaviorExecutionSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper"> - <param name="semanticHint" value="BehaviorExecutionSpecification_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_Shape" - name="%metatype.name.StateInvariant_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="StateInvariant" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.StateInvariantEditHelper"> - <param name="semanticHint" value="StateInvariant_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_CoRegionShape" - name="%metatype.name.CombinedFragment_CoRegionShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape"/> - <param name="semanticHint" value="CombinedFragment_CoRegionShape"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_Shape" - name="%metatype.name.TimeConstraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="TimeConstraint" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeConstraintEditHelper"> - <param name="semanticHint" value="TimeConstraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_Shape" - name="%metatype.name.TimeObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="TimeObservation" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeObservationEditHelper"> - <param name="semanticHint" value="TimeObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape" - name="%metatype.name.DurationConstraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DurationConstraint" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationConstraintEditHelper"> - <param name="semanticHint" value="DurationConstraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.DestructionOccurrenceSpecification_Shape" - name="%metatype.name.DestructionOccurrenceSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DestructionOccurrenceSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DestructionEventEditHelper"> - <param name="semanticHint" value="DestructionOccurrenceSpecification_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Constraint_Shape" - name="%metatype.name.Constraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Constraint" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConstraintEditHelper"> - <param name="semanticHint" value="Constraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Comment_Shape" - name="%metatype.name.Comment_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Comment" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CommentEditHelper"> - <param name="semanticHint" value="Comment_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape_CN" - name="%metatype.name.DurationConstraint_Shape_CN" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape"/> - <param name="semanticHint" value="DurationConstraint_Shape_CN"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_Shape" - name="%metatype.name.DurationObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DurationObservation" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationObservationEditHelper"> - <param name="semanticHint" value="DurationObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge" - name="%metatype.name.Message_SynchEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Message" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageEditHelper"> - <param name="semanticHint" value="Message_SynchEdge"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_AsynchEdge" - name="%metatype.name.Message_AsynchEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_AsynchEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_ReplyEdge" - name="%metatype.name.Message_ReplyEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_ReplyEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_CreateEdge" - name="%metatype.name.Message_CreateEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_CreateEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_DeleteEdge" - name="%metatype.name.Message_DeleteEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_DeleteEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_LostEdge" - name="%metatype.name.Message_LostEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_LostEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Message_FoundEdge" - name="%metatype.name.Message_FoundEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <param name="semanticHint" value="Message_FoundEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Comment_AnnotatedElementEdge" - name="%metatype.name.Comment_AnnotatedElementEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Comment_AnnotatedElementEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ConstrainedElementEdge" - name="%metatype.name.Constraint_ConstrainedElementEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Constraint_ConstrainedElementEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_Edge" - name="%metatype.name.GeneralOrdering_Edge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="GeneralOrdering" - edithelper="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.GeneralOrderingEditHelper"> - <param name="semanticHint" value="GeneralOrdering_Edge"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ContextEdge" - name="%metatype.name.Constraint_ContextEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Constraint_ContextEdge"/> - </specializationType> - </metamodel> - </extension> - - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> +<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> <?gmfgen generated="true"?> <clientContext id="org.eclipse.papyrus.uml.diagram.sequence.TypeContext"> <enablement> @@ -506,41 +203,8 @@ value="org.eclipse.papyrus.uml.diagram.sequence.EditingDomain"/> </enablement> </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.sequence.TypeContext"> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Package_SequenceDiagram"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Interaction_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Continuation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Lifeline_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_CoRegionShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.DestructionOccurrenceSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Constraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Comment_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape_CN"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_AsynchEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_ReplyEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_CreateEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_DeleteEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_LostEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Message_FoundEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Comment_AnnotatedElementEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ConstrainedElementEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_Edge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ContextEdge"/> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> </extension> + <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput"> <?gmfgen generated="true"?> <propertyTester @@ -1268,39 +932,6 @@ </Priority> </editpolicyProvider> </extension> -<extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel - nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.sequence.SequenceViewDependentsAdvice" - id="org.eclipse.papyrus.uml.diagram.sequence.viewDependences" - inheritance="all" - typeId="*"> - </adviceBinding> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice" - id="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd" - inheritance="all" - typeId="*"> - </adviceBinding> - </metamodel> -</extension> -<extension - point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - <binding - context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <advice - ref="org.eclipse.papyrus.uml.diagram.sequence.viewDependences"> - </advice> - </binding> - <binding - context="org.eclipse.papyrus.uml.diagram.sequence.TypeContext"> - <advice - ref="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd"> - </advice> - </binding> -</extension> <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders"> <editpartProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomEditPartProvider"> <Priority name="Medium"/> @@ -1799,6 +1430,20 @@ <extension point="org.eclipse.ui.handlers" id="menu-handlers"> <?gmfgen generated="true"?> </extension> +<extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.uml.diagram.sequence.TypeContext" + path="model/sequencediagram.elementtypesconfigurations"> + </elementTypeSet> +</extension> +<extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/sequencediagram-uml.elementtypesconfigurations"> + </elementTypeSet> +</extension> </plugin> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml index 2dd2c528ef6..42ef8aab93b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml @@ -202,38 +202,9 @@ </extension> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> <!-- Diagram specific advices --> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.NamespaceHelperAdvice" - id="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice" - inheritance="all" - typeId="org.eclipse.papyrus.uml.Namespace"> - </adviceBinding> - <adviceBinding - class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConstraintHelperAdvice" - id="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice" - inheritance="none" - typeId="org.eclipse.papyrus.uml.Constraint"> - </adviceBinding> - </metamodel> - </extension> <extension point="org.eclipse.ui.menus" id="context-menus"> <?gmfgen generated="true"?> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy.java index 61992f1e9dc..5439cb2451d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy.java @@ -21,11 +21,11 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
import org.eclipse.papyrus.uml.diagram.timing.custom.Messages;
import org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands.RefreshCommandForDo;
import org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands.RefreshCommandForUndo;
@@ -41,7 +41,7 @@ import org.eclipse.uml2.uml.Lifeline; * This EditPolicy creates a StateInvariant when the first StateDefinition is created, and links the StateInvariant to
* the StateDefinition.
*/
-public class CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy extends CreationEditPolicy {
+public class CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy extends DefaultCreationEditPolicy {
public CustomFullLifelineStateDefinitionCompartmentCreationEditPolicy() {
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java new file mode 100644 index 00000000000..19dcf315b4d --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java @@ -0,0 +1,46 @@ +/***************************************************************************** + * Copyright (c) 2016 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice; + + +import org.eclipse.gmf.runtime.common.core.command.ICommand; +import org.eclipse.gmf.runtime.common.core.command.IdentityCommand; +import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand; +import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice; +import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest; + +/** This advice does nothing because the actual semantic command are done somewhere else. */ +public class StateDefinitionHelperAdvice extends AbstractEditHelperAdvice { + + @Override + protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) { + + GetEditContextCommand command = new GetEditContextCommand(request); + command.setEditContext(request.getEditHelperContext()); + return command; + } + + /** + * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) + * + * @param request + * @return + */ + @Override + protected ICommand getAfterCreateCommand(CreateElementRequest request) { + return IdentityCommand.INSTANCE; + } + +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations new file mode 100644 index 00000000000..90beb51c00f --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations @@ -0,0 +1,17 @@ +<?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="_BJMa0PyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.uml.elementTypeSet" name="PapyrusUMLTimingDiagramUML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:ExternallyRegisteredType" xmi:id="_m5cHEACHEeauW73l_j0dpw" identifier="org.eclipse.gmf.runtime.emf.type.core.default" name="DefaultMetamodelType"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nL7yIPyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.GateHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.GateHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sclz6lYCEeS0WsAAtVmToA"/> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PIoBwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecificationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.OccurrenceSpecificationHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc6kKlYCEeS0WsAAtVmToA"/> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jztwwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.StateInvariantHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateInvariantHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdCf9lYCEeS0WsAAtVmToA"/> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_InLNAACIEeauW73l_j0dpw" identifier="org.eclipse.papyrus.uml.diagram.timing.DefaultTypeHelperAdvice" target="_m5cHEACHEeauW73l_j0dpw" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.DefaultTypeHelperAdvice"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_upuh0ACuEeaVcbLzq0LlyQ" identifier="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateDefinitionHelperAdvice"> + <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p8dx0EeWVxMf7SXAfhg"/> + </adviceBindingsConfigurations> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml index b584abf474d..58146d71b8f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml @@ -202,316 +202,7 @@ </ParserProvider> </extension> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types"> - <?gmfgen generated="true"?> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.Package_TimingDiagram" - name="%metatype.name.Package_TimingDiagram" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Package" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.PackageEditHelper"> - <param name="semanticHint" value="Package_TimingDiagram"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.Interaction_Shape" - name="%metatype.name.Interaction_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Interaction" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.InteractionEditHelper"> - <param name="semanticHint" value="Interaction_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_FullShape" - name="%metatype.name.Lifeline_FullShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullLifelineEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_Shape"/> - <param name="semanticHint" value="Lifeline_FullShape"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_CompactShape" - name="%metatype.name.Lifeline_CompactShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactLifelineEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_Shape"/> - <param name="semanticHint" value="Lifeline_CompactShape"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.StateInvariant_FullShape" - name="%metatype.name.StateInvariant_FullShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="StateInvariant" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullStateInvariantEditHelper"> - <param name="semanticHint" value="StateInvariant_FullShape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.StateInvariant_CompactShape" - name="%metatype.name.StateInvariant_CompactShape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactStateInvariantEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.StateInvariant_FullShape"/> - <param name="semanticHint" value="StateInvariant_CompactShape"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_Shape" - name="%metatype.name.OccurrenceSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="OccurrenceSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.OccurrenceSpecificationEditHelper"> - <param name="semanticHint" value="OccurrenceSpecification_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_Shape" - name="%metatype.name.MessageOccurrenceSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="MessageOccurrenceSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageOccurrenceSpecificationEditHelper"> - <param name="semanticHint" value="MessageOccurrenceSpecification_Shape"/> - </metamodelType> - </metamodel> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Node_StateDefinitionShape" - name="%metatype.name.Node_StateDefinitionShape" - kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Node_StateDefinitionShape"/> - </specializationType> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Node_StateInvariantTransitionShape" - name="%metatype.name.Node_StateInvariantTransitionShape" - kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Node_StateInvariantTransitionShape"/> - </specializationType> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_Shape" - name="%metatype.name.TimeConstraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="TimeConstraint" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeConstraintEditHelper"> - <param name="semanticHint" value="TimeConstraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_Shape" - name="%metatype.name.TimeObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="TimeObservation" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeObservationEditHelper"> - <param name="semanticHint" value="TimeObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_Shape" - name="%metatype.name.DurationConstraint_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DurationConstraint" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationConstraintEditHelper"> - <param name="semanticHint" value="DurationConstraint_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_Shape" - name="%metatype.name.DurationObservation_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DurationObservation" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationObservationEditHelper"> - <param name="semanticHint" value="DurationObservation_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_Shape" - name="%metatype.name.GeneralOrdering_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="GeneralOrdering" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GeneralOrderingEditHelper"> - <param name="semanticHint" value="GeneralOrdering_Shape"/> - </metamodelType> - </metamodel> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Node_FreeTimeRulerShape" - name="%metatype.name.Node_FreeTimeRulerShape" - kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Node_FreeTimeRulerShape"/> - </specializationType> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Node_LinearTimeRulerShape" - name="%metatype.name.Node_LinearTimeRulerShape" - kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Node_LinearTimeRulerShape"/> - </specializationType> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Node_TickShape" - name="%metatype.name.Node_TickShape" - kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> - <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/> - <param name="semanticHint" value="Node_TickShape"/> - </specializationType> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_Shape" - name="%metatype.name.DestructionOccurrenceSpecification_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DestructionOccurrenceSpecification" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DestructionOccurrenceSpecificationEditHelper"> - <param name="semanticHint" value="DestructionOccurrenceSpecification_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_Shape" - name="%metatype.name.Lifeline_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Lifeline" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.LifelineEditHelper"> - <param name="semanticHint" value="Lifeline_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.Gate_Shape" - name="%metatype.name.Gate_Shape" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Gate" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GateEditHelper"> - <param name="semanticHint" value="Gate_Shape"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <metamodelType - id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge" - name="%metatype.name.Message_SynchEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Message" - edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageSyncEditHelper"> - <param name="semanticHint" value="Message_SynchEdge"/> - </metamodelType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_AsynchEdge" - name="%metatype.name.Message_AsynchEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageAsyncEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_AsynchEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_ReplyEdge" - name="%metatype.name.Message_ReplyEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageReplyEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_ReplyEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_CreateEdge" - name="%metatype.name.Message_CreateEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageCreateEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_CreateEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_DeleteEdge" - name="%metatype.name.Message_DeleteEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageDeleteEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_DeleteEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_LostEdge" - name="%metatype.name.Message_LostEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageLostEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_LostEdge"/> - </specializationType> - </metamodel> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <specializationType - id="org.eclipse.papyrus.uml.diagram.timing.Message_FoundEdge" - name="%metatype.name.Message_FoundEdge" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageFoundEditHelper"> - <specializes id="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <param name="semanticHint" value="Message_FoundEdge"/> - </specializationType> - </metamodel> - </extension> - - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.timing.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.timing.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.timing.TypeContext"> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Package_TimingDiagram"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Interaction_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_FullShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_CompactShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.StateInvariant_FullShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.StateInvariant_CompactShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_StateDefinitionShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_StateInvariantTransitionShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_FreeTimeRulerShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_LinearTimeRulerShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_TickShape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Gate_Shape"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_AsynchEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_ReplyEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_CreateEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_DeleteEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_LostEdge"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Message_FoundEdge"/> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> + <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput"> <?gmfgen generated="true"?> <propertyTester @@ -813,36 +504,8 @@ </extension> <!-- Diagram specific advices --> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes"> - <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <adviceBinding id="org.eclipse.papyrus.uml.diagram.timing.StateInvariantHelperAdvice" - class="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateInvariantHelperAdvice" - inheritance="all" typeId="org.eclipse.papyrus.uml.StateInvariant"> - </adviceBinding> - <adviceBinding id="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecificationHelperAdvice" - class="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.OccurrenceSpecificationHelperAdvice" - inheritance="all" typeId="org.eclipse.papyrus.uml.OccurrenceSpecification"> - </adviceBinding> - <adviceBinding id="org.eclipse.papyrus.uml.diagram.timing.GateHelperAdvice" - class="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.GateHelperAdvice" - inheritance="all" typeId="org.eclipse.papyrus.uml.Gate"> - </adviceBinding> - <adviceBinding id="org.eclipse.papyrus.uml.diagram.timing.DefaultTypeHelperAdvice" - class="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.DefaultTypeHelperAdvice" - inheritance="all" typeId="org.eclipse.gmf.runtime.emf.type.core.default"> - </adviceBinding> - </metamodel> - </extension> <!-- Bindings to the shared Papyrus context --> - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings"> - <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext"> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.StateInvariantHelperAdvice"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecificationHelperAdvice"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.GateHelperAdvice"/> - <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DefaultTypeHelperAdvice"/> - </binding> - </extension> @@ -1234,6 +897,13 @@ diagramType="PapyrusUMLTimingDiagram"> </visualTypeProvider> </extension> + <extension + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> + <elementTypeSet + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" + path="model/timingdiagram-uml.elementtypesconfigurations"> + </elementTypeSet> + </extension> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLElementTypes.java index 638a6bb663b..00a759b8607 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLElementTypes.java @@ -86,169 +86,169 @@ public class UMLElementTypes { * @generated */ public static final IElementType Package_TimingDiagram = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Package_TimingDiagram"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Package_TimingDiagram"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Interaction_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Interaction_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Interaction_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Lifeline_FullShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Lifeline_FullShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Lifeline_FullShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Lifeline_CompactShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Lifeline_CompactShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Lifeline_CompactShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType StateInvariant_FullShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.StateInvariant_FullShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.StateInvariant_FullShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType StateInvariant_CompactShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.StateInvariant_CompactShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.StateInvariant_CompactShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType OccurrenceSpecification_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType MessageOccurrenceSpecification_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Node_StateDefinitionShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Node_StateDefinitionShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Node_StateDefinitionShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Node_StateInvariantTransitionShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Node_StateInvariantTransitionShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Node_StateInvariantTransitionShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType TimeConstraint_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.TimeConstraint_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType TimeObservation_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.TimeObservation_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.TimeObservation_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType DurationConstraint_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.DurationConstraint_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType DurationObservation_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.DurationObservation_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.DurationObservation_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType GeneralOrdering_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.GeneralOrdering_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Node_FreeTimeRulerShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Node_FreeTimeRulerShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Node_FreeTimeRulerShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Node_LinearTimeRulerShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Node_LinearTimeRulerShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Node_LinearTimeRulerShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Node_TickShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Node_TickShape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Node_TickShape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType DestructionOccurrenceSpecification_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Lifeline_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Lifeline_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Lifeline_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Gate_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Gate_Shape"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Gate_Shape"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_SynchEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_SynchEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_SynchEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_AsynchEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_AsynchEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_AsynchEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_ReplyEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_ReplyEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_ReplyEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_CreateEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_CreateEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_CreateEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_DeleteEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_DeleteEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_DeleteEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_LostEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_LostEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_LostEdge"); //$NON-NLS-1$ /** * @generated */ public static final IElementType Message_FoundEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.uml.diagram.timing.Message_FoundEdge"); //$NON-NLS-1$ + "org.eclipse.papyrus.umldi.Message_FoundEdge"); //$NON-NLS-1$ /** * @generated diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml index 63c19d097a2..a624fb6cda4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml @@ -140,19 +140,6 @@ - <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings"> - <?gmfgen generated="true"?> - <clientContext id="org.eclipse.papyrus.uml.diagram.usecase.TypeContext"> - <enablement> - <test - property="org.eclipse.gmf.runtime.emf.core.editingDomain" - value="org.eclipse.papyrus.uml.diagram.usecase.EditingDomain"/> - </enablement> - </clientContext> - <binding context="org.eclipse.papyrus.uml.diagram.usecase.TypeContext"> - <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> - </binding> - </extension> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations index e1c86075aef..3f6e796d9aa 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations @@ -1075,7 +1075,7 @@ <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" target="_SccC-1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" target="_Scbb2FYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" target="_SccC-1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice"/> - <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" description="" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" target="_SccC-1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" description="" target="_SccC-1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Classifier" target="_Sca0z1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Collaboration" target="_Sca07VYCEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" target="_Sca071YCEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"/> @@ -1095,8 +1095,8 @@ <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.StructuredClassifier" target="_SdGxUVYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StructuredClassifierHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityNode" target="_ScTgJVYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityNodeHelperAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityGroup" target="_ScTgI1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityGroupEditHelperAdvice"/> - <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" target="_ScgUUFYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." target="_ScgUUFYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_OGm-gAR_EeWEmNqzWv7tuw" identifier="org.eclipse.papyrus.uml.advice.TemplateableElement" target="_SdHYY1YCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateableElementEditHelperAdvice"/> - <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" description="Advice that tweaks requests to provide hints to the read-only advice" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" target="_ScgUUFYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" description="Advice that tweaks requests to provide hints to the read-only advice" target="_ScgUUFYCEeS0WsAAtVmToA" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice"/> <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SJGO0DWbEeWdwYNHBiYLiA" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice_CommunicationPath" target="_Scbb2lYCEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/> </elementtypesconfigurations:ElementTypeSetConfiguration> |
