Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2019-04-25 11:45:15 -0400
committerAnsgar Radermacher2019-05-07 04:50:07 -0400
commit56e0e4085e8dc5e318791fa881cc4cf0de395a4d (patch)
treec420eaf9a6b421f1451c8985c8ac91f33bb6939f
parentf13d47654fd242d83b6e7db2d2aac29fc478bbdf (diff)
downloadorg.eclipse.papyrus-56e0e4085e8dc5e318791fa881cc4cf0de395a4d.tar.gz
org.eclipse.papyrus-56e0e4085e8dc5e318791fa881cc4cf0de395a4d.tar.xz
org.eclipse.papyrus-56e0e4085e8dc5e318791fa881cc4cf0de395a4d.zip
Bug 546747 - [Element types] A missing target in an advice binding is not detected by validation
- Change multiplicity in UML file - Regenerate model code. Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore3
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel126
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml133
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java24
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java20
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java50
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java3
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java12
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java10
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java11
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java65
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java4
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java7
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java4
22 files changed, 315 insertions, 189 deletions
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 60bbc306900..7d19f9bd413 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
@@ -37,7 +37,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"
abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//ElementTypeConfiguration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+ eType="#//ElementTypeConfiguration"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
eType="#//ContainerConfiguration" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
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 14c6c47d489..2c4f08db347 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
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; CEA LIST - Initial API and implementation"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+ copyrightText="Copyright (c) 2014 CEA LIST.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; CEA LIST - Initial API and implementation"
modelDirectory="/org.eclipse.papyrus.infra.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.types.edit/src-gen"
editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.types"
modelName="ElementTypesConfigurations" editPluginClass="org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin"
@@ -36,76 +37,91 @@
<details key="VALIDATION_DELEGATES" value="IGNORE"/>
</genAnnotations>
<foreignModel>ElementTypesConfigurations.uml</foreignModel>
- <genPackages prefix="ElementTypesConfigurations" basePackage="org.eclipse.papyrus.infra"
- disposableProviderFactory="true" extensibleProviderFactory="true" contentTypeIdentifier="org.eclipse.papyrus.infra.types"
- fileExtensions="elementtypesconfigurations" ecorePackage="ElementTypesConfigurations.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="ElementTypesConfigurations.ecore#//InheritanceKind">
- <genEnumLiterals ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
- <genEnumLiterals ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
+ <genPackages xsi:type="genmodel:GenPackage" prefix="ElementTypesConfigurations"
+ basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true" extensibleProviderFactory="true"
+ contentTypeIdentifier="org.eclipse.papyrus.infra.types" fileExtensions="elementtypesconfigurations"
+ ecorePackage="ElementTypesConfigurations.ecore#/">
+ <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="ElementTypesConfigurations.ecore#//InheritanceKind">
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
</genEnums>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//ConfigurationElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ConfigurationElement/description"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//ConfigurationElement">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ConfigurationElement/description"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//IconEntry">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IconEntry/iconPath"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IconEntry/bundleId"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//IconEntry">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IconEntry/iconPath"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IconEntry/bundleId"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"
labelFeature="#//types/IdentifiedConfiguration/identifier">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AdviceConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AdviceConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ContainerConfiguration">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/eContainmentFeatures"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//ContainerConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/eContainmentFeatures"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypes"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypes"/>
</genClasses>
- <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration/target"/>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+ ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration/target"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/eClass"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/eClass"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//MatcherConfiguration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//MatcherConfiguration/matcherClassName"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//MatcherConfiguration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//MatcherConfiguration/matcherClassName"/>
</genClasses>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredType"/>
- <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredAdvice"
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredType"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//ExternallyRegisteredAdvice"
labelFeature="#//types/IdentifiedConfiguration/identifier"/>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
index 21908d577f1..92695512c09 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
@@ -2,114 +2,115 @@
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
<uml:Model xmi:id="_VkhJIBLoEeeDV7UHoBIkeA" name="types" URI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2">
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwMBLoEeeDV7UHoBIkeA" name="ElementTypeSetConfiguration">
- <generalization xmi:id="_VkhwMRLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwMhLoEeeDV7UHoBIkeA" name="elementTypeConfigurations" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwVRLoEeeDV7UHoBIkeA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwMRLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwMhLoEeeDV7UHoBIkeA" name="elementTypeConfigurations" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwVRLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwMxLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwNBLoEeeDV7UHoBIkeA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwNRLoEeeDV7UHoBIkeA" name="adviceBindingsConfigurations" type="_VkhwVxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwgRLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwNRLoEeeDV7UHoBIkeA" name="adviceBindingsConfigurations" type="_VkhwVxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwgRLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwNhLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwNxLoEeeDV7UHoBIkeA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwOBLoEeeDV7UHoBIkeA" name="metamodelNsURI" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwOBLoEeeDV7UHoBIkeA" name="metamodelNsURI" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_VkhwORLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
- <interfaceRealization xmi:id="_VkhwOhLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwORLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwOhLoEeeDV7UHoBIkeA" client="_VkhwMBLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwOxLoEeeDV7UHoBIkeA" name="ConfigurationElement" isAbstract="true">
- <ownedAttribute xmi:id="_VkhwPBLoEeeDV7UHoBIkeA" name="description" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwPBLoEeeDV7UHoBIkeA" name="description" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwPRLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_VkhwPhLoEeeDV7UHoBIkeA" name="IdentifiedConfiguration">
- <ownedAttribute xmi:id="_VkhwPxLoEeeDV7UHoBIkeA" name="identifier" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwPxLoEeeDV7UHoBIkeA" name="identifier" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_VkhwQBLoEeeDV7UHoBIkeA" name="NamedConfiguration">
- <ownedAttribute xmi:id="_VkhwQRLoEeeDV7UHoBIkeA" name="name" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwQRLoEeeDV7UHoBIkeA" name="name" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwQhLoEeeDV7UHoBIkeA" name="ElementTypeConfiguration" isAbstract="true">
- <generalization xmi:id="_VkhwQxLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwRBLoEeeDV7UHoBIkeA" name="hint" visibility="public" isOrdered="true">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwQxLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwRBLoEeeDV7UHoBIkeA" name="hint" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwRRLoEeeDV7UHoBIkeA"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VkhwRhLoEeeDV7UHoBIkeA" value="">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwRxLoEeeDV7UHoBIkeA" name="kind" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwRxLoEeeDV7UHoBIkeA" name="kind" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwSBLoEeeDV7UHoBIkeA"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VkhwSRLoEeeDV7UHoBIkeA" value="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwShLoEeeDV7UHoBIkeA" name="iconEntry" type="_VkhwThLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwUxLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwShLoEeeDV7UHoBIkeA" name="iconEntry" type="_VkhwThLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwUxLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwSxLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_VkhwTBLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
- <interfaceRealization xmi:id="_VkhwTRLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTBLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTRLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwThLoEeeDV7UHoBIkeA" name="IconEntry">
- <ownedAttribute xmi:id="_VkhwTxLoEeeDV7UHoBIkeA" name="iconPath" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwTxLoEeeDV7UHoBIkeA" name="iconPath" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwUBLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwURLoEeeDV7UHoBIkeA" name="bundleId" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwURLoEeeDV7UHoBIkeA" name="bundleId" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwUhLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwUxLoEeeDV7UHoBIkeA" memberEnd="_VkhwShLoEeeDV7UHoBIkeA _VkhwVBLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwVBLoEeeDV7UHoBIkeA" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_VkhwUxLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwVBLoEeeDV7UHoBIkeA" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_VkhwUxLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwVRLoEeeDV7UHoBIkeA" memberEnd="_VkhwMhLoEeeDV7UHoBIkeA _VkhwVhLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwVhLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwVRLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwVhLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwVRLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwVxLoEeeDV7UHoBIkeA" name="AbstractAdviceBindingConfiguration" isAbstract="true">
- <generalization xmi:id="_VkhwWBLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwWRLoEeeDV7UHoBIkeA" name="target" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwbRLoEeeDV7UHoBIkeA">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwWhLoEeeDV7UHoBIkeA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwWBLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwWRLoEeeDV7UHoBIkeA" name="target" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwbRLoEeeDV7UHoBIkeA">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwWhLoEeeDV7UHoBIkeA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SixAkGdmEemuaY_wnFi0kA" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwWxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwehLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwWxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwehLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwXBLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwXRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwfBLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwXRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwfBLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwXhLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwXxLoEeeDV7UHoBIkeA" name="inheritance" visibility="public" type="_VkhwfhLoEeeDV7UHoBIkeA" isOrdered="true"/>
- <interfaceRealization xmi:id="_VkhwYBLoEeeDV7UHoBIkeA" client="_VkhwVxLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwXxLoEeeDV7UHoBIkeA" name="inheritance" visibility="public" type="_VkhwfhLoEeeDV7UHoBIkeA" isOrdered="true"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwYBLoEeeDV7UHoBIkeA" client="_VkhwVxLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwYRLoEeeDV7UHoBIkeA" name="AdviceConfiguration" isAbstract="true">
- <generalization xmi:id="_VkhwYhLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwYxLoEeeDV7UHoBIkeA" name="before" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaRLoEeeDV7UHoBIkeA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwYhLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwYxLoEeeDV7UHoBIkeA" name="before" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaRLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwZBLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwZRLoEeeDV7UHoBIkeA" value="*"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwZhLoEeeDV7UHoBIkeA" name="after" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaxLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwZhLoEeeDV7UHoBIkeA" name="after" type="_VkhwYRLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwaxLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwZxLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwaBLoEeeDV7UHoBIkeA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwaRLoEeeDV7UHoBIkeA" memberEnd="_VkhwYxLoEeeDV7UHoBIkeA _VkhwahLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwahLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaRLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwahLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaRLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwaxLoEeeDV7UHoBIkeA" memberEnd="_VkhwZhLoEeeDV7UHoBIkeA _VkhwbBLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwbBLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaxLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwbBLoEeeDV7UHoBIkeA" type="_VkhwYRLoEeeDV7UHoBIkeA" association="_VkhwaxLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwbRLoEeeDV7UHoBIkeA" memberEnd="_VkhwWRLoEeeDV7UHoBIkeA _VkhwbhLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwbhLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwbRLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwbhLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwbRLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwbxLoEeeDV7UHoBIkeA" name="ContainerConfiguration">
- <ownedAttribute xmi:id="_VkhwcBLoEeeDV7UHoBIkeA" name="containerMatcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwdhLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwcBLoEeeDV7UHoBIkeA" name="containerMatcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwdhLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcRLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwchLoEeeDV7UHoBIkeA" name="eContainmentFeatures" isOrdered="true" association="_VkhweBLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwchLoEeeDV7UHoBIkeA" name="eContainmentFeatures" isOrdered="true" association="_VkhweBLoEeeDV7UHoBIkeA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EReference"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcxLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwdBLoEeeDV7UHoBIkeA" value="*"/>
@@ -117,97 +118,97 @@
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwdRLoEeeDV7UHoBIkeA" name="AbstractMatcherConfiguration" isAbstract="true"/>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwdhLoEeeDV7UHoBIkeA" memberEnd="_VkhwcBLoEeeDV7UHoBIkeA _VkhwdxLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwdxLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhwdhLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwdxLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhwdhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhweBLoEeeDV7UHoBIkeA" memberEnd="_VkhwchLoEeeDV7UHoBIkeA _VkhweRLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhweRLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhweBLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhweRLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhweBLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwehLoEeeDV7UHoBIkeA" memberEnd="_VkhwWxLoEeeDV7UHoBIkeA _VkhwexLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwexLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwehLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwexLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwehLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwfBLoEeeDV7UHoBIkeA" memberEnd="_VkhwXRLoEeeDV7UHoBIkeA _VkhwfRLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwfRLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwfBLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwfRLoEeeDV7UHoBIkeA" type="_VkhwVxLoEeeDV7UHoBIkeA" association="_VkhwfBLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_VkhwfhLoEeeDV7UHoBIkeA" name="InheritanceKind">
- <ownedLiteral xmi:id="_VkhwfxLoEeeDV7UHoBIkeA" name="none"/>
- <ownedLiteral xmi:id="_VkhwgBLoEeeDV7UHoBIkeA" name="all"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VkhwfxLoEeeDV7UHoBIkeA" name="none"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VkhwgBLoEeeDV7UHoBIkeA" name="all"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwgRLoEeeDV7UHoBIkeA" memberEnd="_VkhwNRLoEeeDV7UHoBIkeA _VkhwghLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwghLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwgRLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwghLoEeeDV7UHoBIkeA" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwgRLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwgxLoEeeDV7UHoBIkeA" name="SpecializationTypeConfiguration">
- <generalization xmi:id="_VkhwhBLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkRLoEeeDV7UHoBIkeA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwhBLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkRLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwhhLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkhLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkhLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwiBLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwlBLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwlBLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwihLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwixLoEeeDV7UHoBIkeA" name="specializedTypes" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwlhLoEeeDV7UHoBIkeA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwixLoEeeDV7UHoBIkeA" name="specializedTypes" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwlhLoEeeDV7UHoBIkeA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwjBLoEeeDV7UHoBIkeA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwjRLoEeeDV7UHoBIkeA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwjhLoEeeDV7UHoBIkeA" name="AbstractEditHelperAdviceConfiguration" isAbstract="true">
- <generalization xmi:id="_VkhwjxLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwjxLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwkRLoEeeDV7UHoBIkeA" memberEnd="_VkhwhRLoEeeDV7UHoBIkeA _VkhwkBLoEeeDV7UHoBIkeA"/>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwkhLoEeeDV7UHoBIkeA" memberEnd="_VkhwhxLoEeeDV7UHoBIkeA _VkhwkxLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwkhLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwkhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwlBLoEeeDV7UHoBIkeA" memberEnd="_VkhwiRLoEeeDV7UHoBIkeA _VkhwlRLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlBLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlBLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwlhLoEeeDV7UHoBIkeA" memberEnd="_VkhwixLoEeeDV7UHoBIkeA _VkhwlxLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwlxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlhLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwmBLoEeeDV7UHoBIkeA" name="MetamodelTypeConfiguration">
- <generalization xmi:id="_VkhwmRLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwmhLoEeeDV7UHoBIkeA" name="eClass" isOrdered="true" association="_VkhwnhLoEeeDV7UHoBIkeA">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwmRLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwmhLoEeeDV7UHoBIkeA" name="eClass" isOrdered="true" association="_VkhwnhLoEeeDV7UHoBIkeA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClass"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwmxLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_VkhwnBLoEeeDV7UHoBIkeA" name="editHelperClassName" visibility="public" isOrdered="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwnBLoEeeDV7UHoBIkeA" name="editHelperClassName" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwnRLoEeeDV7UHoBIkeA"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_VkhwnhLoEeeDV7UHoBIkeA" memberEnd="_VkhwmhLoEeeDV7UHoBIkeA _VkhwnxLoEeeDV7UHoBIkeA">
- <ownedEnd xmi:id="_VkhwnxLoEeeDV7UHoBIkeA" type="_VkhwmBLoEeeDV7UHoBIkeA" association="_VkhwnhLoEeeDV7UHoBIkeA"/>
+ <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwnxLoEeeDV7UHoBIkeA" type="_VkhwmBLoEeeDV7UHoBIkeA" association="_VkhwnhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwoBLoEeeDV7UHoBIkeA" name="EditHelperAdviceConfiguration">
- <generalization xmi:id="_VkhwoRLoEeeDV7UHoBIkeA" general="_VkhwjhLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwohLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwoRLoEeeDV7UHoBIkeA" general="_VkhwjhLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwohLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwoxLoEeeDV7UHoBIkeA" name="AdviceBindingConfiguration">
- <generalization xmi:id="_VkhwpBLoEeeDV7UHoBIkeA" general="_VkhwVxLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwpRLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwpBLoEeeDV7UHoBIkeA" general="_VkhwVxLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwpRLoEeeDV7UHoBIkeA" name="editHelperAdviceClassName" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwphLoEeeDV7UHoBIkeA" name="MatcherConfiguration">
- <generalization xmi:id="_VkhwpxLoEeeDV7UHoBIkeA" general="_VkhwdRLoEeeDV7UHoBIkeA"/>
- <ownedAttribute xmi:id="_VkhwqBLoEeeDV7UHoBIkeA" name="matcherClassName" visibility="public" isOrdered="true">
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwpxLoEeeDV7UHoBIkeA" general="_VkhwdRLoEeeDV7UHoBIkeA"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwqBLoEeeDV7UHoBIkeA" name="matcherClassName" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwqRLoEeeDV7UHoBIkeA" name="ExternallyRegisteredType">
- <generalization xmi:id="_VkhwqhLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwqhLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_VkhwqxLoEeeDV7UHoBIkeA" name="ExternallyRegisteredAdvice">
- <generalization xmi:id="_VkhwrBLoEeeDV7UHoBIkeA" general="_VkhwoxLoEeeDV7UHoBIkeA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_VkhwrBLoEeeDV7UHoBIkeA" general="_VkhwoxLoEeeDV7UHoBIkeA"/>
</packagedElement>
- <profileApplication xmi:id="_VkhwrRLoEeeDV7UHoBIkeA">
- <eAnnotations xmi:id="_VkhwrhLoEeeDV7UHoBIkeA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VkhwrRLoEeeDV7UHoBIkeA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VkhwrhLoEeeDV7UHoBIkeA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
</eAnnotations>
- <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
</profileApplication>
</uml:Model>
<Ecore:EPackage xmi:id="_VkhwrxLoEeeDV7UHoBIkeA" base_Package="_VkhJIBLoEeeDV7UHoBIkeA" nsPrefix="elementtypesconfigurations" basePackage="org.eclipse.papyrus.infra"/>
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 4a2c680d70d..4838ae9b813 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
@@ -26,8 +26,8 @@ package org.eclipse.papyrus.infra.types;
* <ul>
* <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
* </ul>
*
* @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration()
@@ -46,7 +46,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
+ * @model required="true"
* @generated
*/
ElementTypeConfiguration getTarget();
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 a2804175ed8..54b3a86689c 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
@@ -518,22 +518,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION = ADVICE_CONFIGURATION_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Inheritance</b></em>' attribute.
* <!-- 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__INHERITANCE = ADVICE_CONFIGURATION_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Inheritance</b></em>' attribute.
+ * 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__INHERITANCE = ADVICE_CONFIGURATION_FEATURE_COUNT + 4;
+ int ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION = ADVICE_CONFIGURATION_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>Abstract Advice Binding Configuration</em>' class.
@@ -1047,22 +1047,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION = ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
/**
- * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Inheritance</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION = ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+ int ADVICE_BINDING_CONFIGURATION__INHERITANCE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
/**
- * The feature id for the '<em><b>Inheritance</b></em>' attribute.
+ * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ADVICE_BINDING_CONFIGURATION__INHERITANCE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+ int ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION = ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
/**
* The feature id for the '<em><b>Edit Helper Advice Class Name</b></em>' attribute.
@@ -1275,22 +1275,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
int EXTERNALLY_REGISTERED_ADVICE__CONTAINER_CONFIGURATION = ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
/**
- * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+ * The feature id for the '<em><b>Inheritance</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EXTERNALLY_REGISTERED_ADVICE__MATCHER_CONFIGURATION = ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+ int EXTERNALLY_REGISTERED_ADVICE__INHERITANCE = ADVICE_BINDING_CONFIGURATION__INHERITANCE;
/**
- * The feature id for the '<em><b>Inheritance</b></em>' attribute.
+ * 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__INHERITANCE = ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+ int EXTERNALLY_REGISTERED_ADVICE__MATCHER_CONFIGURATION = ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
/**
* The feature id for the '<em><b>Edit Helper Advice Class Name</b></em>' attribute.
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java
index 3ef437755cd..3a9ac8c2243 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java
@@ -17,7 +17,6 @@ package org.eclipse.papyrus.infra.types;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
import org.eclipse.emf.common.util.Enumerator;
/**
@@ -29,7 +28,8 @@ import org.eclipse.emf.common.util.Enumerator;
* @model
* @generated
*/
-public enum InheritanceKind implements Enumerator {
+public enum InheritanceKind implements Enumerator
+{
/**
* The '<em><b>None</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -39,7 +39,6 @@ public enum InheritanceKind implements Enumerator {
* @ordered
*/
NONE(0, "none", "none"),
-
/**
* The '<em><b>All</b></em>' literal object.
* <!-- begin-user-doc -->
@@ -49,14 +48,9 @@ public enum InheritanceKind implements Enumerator {
* @ordered
*/
ALL(1, "all", "all");
-
/**
* The '<em><b>None</b></em>' literal value.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @see #NONE
* @model name="none"
@@ -68,10 +62,6 @@ public enum InheritanceKind implements Enumerator {
/**
* The '<em><b>All</b></em>' literal value.
* <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>All</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
* <!-- end-user-doc -->
* @see #ALL
* @model name="all"
@@ -190,6 +180,7 @@ public enum InheritanceKind implements Enumerator {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public int getValue() {
return value;
}
@@ -199,6 +190,7 @@ public enum InheritanceKind implements Enumerator {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -208,6 +200,7 @@ public enum InheritanceKind implements Enumerator {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getLiteral() {
return literal;
}
@@ -222,5 +215,4 @@ public enum InheritanceKind implements Enumerator {
public String toString() {
return literal;
}
-
-} //InheritanceKind
+}
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 8b77c62be1a..47c526ad1ff 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
@@ -41,8 +41,8 @@ import org.eclipse.papyrus.infra.types.InheritanceKind;
* <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getIdentifier <em>Identifier</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>
* <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getInheritance <em>Inheritance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
* </ul>
*
* @generated
@@ -89,34 +89,34 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
protected ContainerConfiguration containerConfiguration;
/**
- * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.
+ * The default value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMatcherConfiguration()
+ * @see #getInheritance()
* @generated
* @ordered
*/
- protected AbstractMatcherConfiguration matcherConfiguration;
+ protected static final InheritanceKind INHERITANCE_EDEFAULT = InheritanceKind.NONE;
/**
- * The default value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.
+ * The cached value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getInheritance()
* @generated
* @ordered
*/
- protected static final InheritanceKind INHERITANCE_EDEFAULT = InheritanceKind.NONE;
+ protected InheritanceKind inheritance = INHERITANCE_EDEFAULT;
/**
- * The cached value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.
+ * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getInheritance()
+ * @see #getMatcherConfiguration()
* @generated
* @ordered
*/
- protected InheritanceKind inheritance = INHERITANCE_EDEFAULT;
+ protected AbstractMatcherConfiguration matcherConfiguration;
/**
* <!-- begin-user-doc -->
@@ -142,6 +142,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getIdentifier() {
return identifier;
}
@@ -151,6 +152,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setIdentifier(String newIdentifier) {
String oldIdentifier = identifier;
identifier = newIdentifier;
@@ -163,6 +165,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ElementTypeConfiguration getTarget() {
if (target != null && target.eIsProxy()) {
InternalEObject oldTarget = (InternalEObject)target;
@@ -189,6 +192,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setTarget(ElementTypeConfiguration newTarget) {
ElementTypeConfiguration oldTarget = target;
target = newTarget;
@@ -201,6 +205,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ContainerConfiguration getContainerConfiguration() {
return containerConfiguration;
}
@@ -225,6 +230,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setContainerConfiguration(ContainerConfiguration newContainerConfiguration) {
if (newContainerConfiguration != containerConfiguration) {
NotificationChain msgs = null;
@@ -244,6 +250,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public AbstractMatcherConfiguration getMatcherConfiguration() {
return matcherConfiguration;
}
@@ -268,6 +275,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setMatcherConfiguration(AbstractMatcherConfiguration newMatcherConfiguration) {
if (newMatcherConfiguration != matcherConfiguration) {
NotificationChain msgs = null;
@@ -287,6 +295,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public InheritanceKind getInheritance() {
return inheritance;
}
@@ -296,6 +305,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setInheritance(InheritanceKind newInheritance) {
InheritanceKind oldInheritance = inheritance;
inheritance = newInheritance == null ? INHERITANCE_EDEFAULT : newInheritance;
@@ -334,10 +344,10 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
return basicGetTarget();
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
return getContainerConfiguration();
- case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
- return getMatcherConfiguration();
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
return getInheritance();
+ case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+ return getMatcherConfiguration();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -359,12 +369,12 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
setContainerConfiguration((ContainerConfiguration)newValue);
return;
- case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
- setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
- return;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
setInheritance((InheritanceKind)newValue);
return;
+ case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+ setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -386,12 +396,12 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
setContainerConfiguration((ContainerConfiguration)null);
return;
- case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
- setMatcherConfiguration((AbstractMatcherConfiguration)null);
- return;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
setInheritance(INHERITANCE_EDEFAULT);
return;
+ case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+ setMatcherConfiguration((AbstractMatcherConfiguration)null);
+ return;
}
super.eUnset(featureID);
}
@@ -410,10 +420,10 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
return target != null;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
return containerConfiguration != null;
- case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
- return matcherConfiguration != null;
case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
return inheritance != INHERITANCE_EDEFAULT;
+ case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+ return matcherConfiguration != null;
}
return super.eIsSet(featureID);
}
@@ -459,7 +469,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (identifier: ");
result.append(identifier);
result.append(", inheritance: ");
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
index 0c05ffad65e..eec04937b27 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
@@ -66,6 +66,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public SpecializationTypeConfiguration getTarget() {
if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET) return null;
return (SpecializationTypeConfiguration)eInternalContainer();
@@ -86,6 +87,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setTarget(SpecializationTypeConfiguration newTarget) {
if (newTarget != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET && newTarget != null)) {
if (EcoreUtil.isAncestor(this, newTarget))
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java
index 9b117b90d55..deb4a50fe77 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java
@@ -81,6 +81,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getEditHelperAdviceClassName() {
return editHelperAdviceClassName;
}
@@ -90,6 +91,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setEditHelperAdviceClassName(String newEditHelperAdviceClassName) {
String oldEditHelperAdviceClassName = editHelperAdviceClassName;
editHelperAdviceClassName = newEditHelperAdviceClassName;
@@ -164,7 +166,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (editHelperAdviceClassName: ");
result.append(editHelperAdviceClassName);
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 e1b2fe3970e..2f59966b395 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
@@ -84,6 +84,7 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<AdviceConfiguration> getBefore() {
if (before == null) {
before = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE);
@@ -96,6 +97,7 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<AdviceConfiguration> getAfter() {
if (after == null) {
after = new EObjectResolvingEList<AdviceConfiguration>(AdviceConfiguration.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER);
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
index 50a3cb6c070..820184316bf 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
@@ -82,6 +82,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getDescription() {
return description;
}
@@ -91,6 +92,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setDescription(String newDescription) {
String oldDescription = description;
description = newDescription;
@@ -165,7 +167,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (description: ");
result.append(description);
result.append(')');
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
index b8394acb2c1..1fe05192d09 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
@@ -93,6 +93,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public AbstractMatcherConfiguration getContainerMatcherConfiguration() {
return containerMatcherConfiguration;
}
@@ -117,6 +118,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setContainerMatcherConfiguration(AbstractMatcherConfiguration newContainerMatcherConfiguration) {
if (newContainerMatcherConfiguration != containerMatcherConfiguration) {
NotificationChain msgs = null;
@@ -136,6 +138,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<EReference> getEContainmentFeatures() {
if (eContainmentFeatures == null) {
eContainmentFeatures = new EObjectResolvingEList<EReference>(EReference.class, this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES);
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java
index 08d4bf6a2b1..695a893bc5f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java
@@ -81,6 +81,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getEditHelperAdviceClassName() {
return editHelperAdviceClassName;
}
@@ -90,6 +91,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setEditHelperAdviceClassName(String newEditHelperAdviceClassName) {
String oldEditHelperAdviceClassName = editHelperAdviceClassName;
editHelperAdviceClassName = newEditHelperAdviceClassName;
@@ -164,7 +166,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (editHelperAdviceClassName: ");
result.append(editHelperAdviceClassName);
result.append(')');
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
index 729b1bfb0ad..9ab77eedf22 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
@@ -160,6 +160,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getIdentifier() {
return identifier;
}
@@ -169,6 +170,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setIdentifier(String newIdentifier) {
String oldIdentifier = identifier;
identifier = newIdentifier;
@@ -181,6 +183,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -190,6 +193,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -202,6 +206,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getHint() {
return hint;
}
@@ -211,6 +216,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setHint(String newHint) {
String oldHint = hint;
hint = newHint;
@@ -223,6 +229,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getKind() {
return kind;
}
@@ -232,6 +239,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setKind(String newKind) {
String oldKind = kind;
kind = newKind;
@@ -244,6 +252,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public IconEntry getIconEntry() {
return iconEntry;
}
@@ -268,6 +277,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setIconEntry(IconEntry newIconEntry) {
if (newIconEntry != iconEntry) {
NotificationChain msgs = null;
@@ -447,7 +457,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (identifier: ");
result.append(identifier);
result.append(", name: ");
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
index 04f99ba3c9a..a8cbb885ed7 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
@@ -158,6 +158,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getIdentifier() {
return identifier;
}
@@ -167,6 +168,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setIdentifier(String newIdentifier) {
String oldIdentifier = identifier;
identifier = newIdentifier;
@@ -179,6 +181,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -188,6 +191,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -200,6 +204,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<ElementTypeConfiguration> getElementTypeConfigurations() {
if (elementTypeConfigurations == null) {
elementTypeConfigurations = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
@@ -212,6 +217,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<AbstractAdviceBindingConfiguration> getAdviceBindingsConfigurations() {
if (adviceBindingsConfigurations == null) {
adviceBindingsConfigurations = new EObjectContainmentEList<AbstractAdviceBindingConfiguration>(AbstractAdviceBindingConfiguration.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
@@ -224,6 +230,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getMetamodelNsURI() {
return metamodelNsURI;
}
@@ -233,6 +240,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setMetamodelNsURI(String newMetamodelNsURI) {
String oldMetamodelNsURI = metamodelNsURI;
metamodelNsURI = newMetamodelNsURI;
@@ -410,7 +418,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (identifier: ");
result.append(identifier);
result.append(", name: ");
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 e0351451caa..eae1643bc2d 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
@@ -119,6 +119,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ElementTypeSetConfiguration createElementTypeSetConfiguration() {
ElementTypeSetConfigurationImpl elementTypeSetConfiguration = new ElementTypeSetConfigurationImpl();
return elementTypeSetConfiguration;
@@ -129,6 +130,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public IconEntry createIconEntry() {
IconEntryImpl iconEntry = new IconEntryImpl();
return iconEntry;
@@ -139,6 +141,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ContainerConfiguration createContainerConfiguration() {
ContainerConfigurationImpl containerConfiguration = new ContainerConfigurationImpl();
return containerConfiguration;
@@ -149,6 +152,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public SpecializationTypeConfiguration createSpecializationTypeConfiguration() {
SpecializationTypeConfigurationImpl specializationTypeConfiguration = new SpecializationTypeConfigurationImpl();
return specializationTypeConfiguration;
@@ -159,6 +163,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public MetamodelTypeConfiguration createMetamodelTypeConfiguration() {
MetamodelTypeConfigurationImpl metamodelTypeConfiguration = new MetamodelTypeConfigurationImpl();
return metamodelTypeConfiguration;
@@ -169,6 +174,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EditHelperAdviceConfiguration createEditHelperAdviceConfiguration() {
EditHelperAdviceConfigurationImpl editHelperAdviceConfiguration = new EditHelperAdviceConfigurationImpl();
return editHelperAdviceConfiguration;
@@ -179,6 +185,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public AdviceBindingConfiguration createAdviceBindingConfiguration() {
AdviceBindingConfigurationImpl adviceBindingConfiguration = new AdviceBindingConfigurationImpl();
return adviceBindingConfiguration;
@@ -189,6 +196,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public MatcherConfiguration createMatcherConfiguration() {
MatcherConfigurationImpl matcherConfiguration = new MatcherConfigurationImpl();
return matcherConfiguration;
@@ -199,6 +207,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ExternallyRegisteredType createExternallyRegisteredType() {
ExternallyRegisteredTypeImpl externallyRegisteredType = new ExternallyRegisteredTypeImpl();
return externallyRegisteredType;
@@ -209,6 +218,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ExternallyRegisteredAdvice createExternallyRegisteredAdvice() {
ExternallyRegisteredAdviceImpl externallyRegisteredAdvice = new ExternallyRegisteredAdviceImpl();
return externallyRegisteredAdvice;
@@ -239,6 +249,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ElementTypesConfigurationsPackage getElementTypesConfigurationsPackage() {
return (ElementTypesConfigurationsPackage)getEPackage();
}
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 f59318188d0..84cd1803809 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
@@ -213,7 +213,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link ElementTypesConfigurationsPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -227,7 +227,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
if (isInited) return (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
// Obtain or create and register package
- ElementTypesConfigurationsPackageImpl theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementTypesConfigurationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementTypesConfigurationsPackageImpl());
+ Object registeredElementTypesConfigurationsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+ ElementTypesConfigurationsPackageImpl theElementTypesConfigurationsPackage = registeredElementTypesConfigurationsPackage instanceof ElementTypesConfigurationsPackageImpl ? (ElementTypesConfigurationsPackageImpl)registeredElementTypesConfigurationsPackage : new ElementTypesConfigurationsPackageImpl();
isInited = true;
@@ -243,7 +244,6 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
// Mark meta-data to indicate it can't be changed
theElementTypesConfigurationsPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(ElementTypesConfigurationsPackage.eNS_URI, theElementTypesConfigurationsPackage);
return theElementTypesConfigurationsPackage;
@@ -254,6 +254,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getElementTypeSetConfiguration() {
return elementTypeSetConfigurationEClass;
}
@@ -263,6 +264,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getElementTypeSetConfiguration_ElementTypeConfigurations() {
return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -272,6 +274,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getElementTypeSetConfiguration_AdviceBindingsConfigurations() {
return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -281,6 +284,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getElementTypeSetConfiguration_MetamodelNsURI() {
return (EAttribute)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(2);
}
@@ -290,6 +294,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getConfigurationElement() {
return configurationElementEClass;
}
@@ -299,6 +304,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getConfigurationElement_Description() {
return (EAttribute)configurationElementEClass.getEStructuralFeatures().get(0);
}
@@ -308,6 +314,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getElementTypeConfiguration() {
return elementTypeConfigurationEClass;
}
@@ -317,6 +324,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getElementTypeConfiguration_Hint() {
return (EAttribute)elementTypeConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -326,6 +334,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getElementTypeConfiguration_Kind() {
return (EAttribute)elementTypeConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -335,6 +344,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getElementTypeConfiguration_IconEntry() {
return (EReference)elementTypeConfigurationEClass.getEStructuralFeatures().get(2);
}
@@ -344,6 +354,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getIconEntry() {
return iconEntryEClass;
}
@@ -353,6 +364,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getIconEntry_IconPath() {
return (EAttribute)iconEntryEClass.getEStructuralFeatures().get(0);
}
@@ -362,6 +374,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getIconEntry_BundleId() {
return (EAttribute)iconEntryEClass.getEStructuralFeatures().get(1);
}
@@ -371,6 +384,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getIdentifiedConfiguration() {
return identifiedConfigurationEClass;
}
@@ -380,6 +394,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getIdentifiedConfiguration_Identifier() {
return (EAttribute)identifiedConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -389,6 +404,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getNamedConfiguration() {
return namedConfigurationEClass;
}
@@ -398,6 +414,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getNamedConfiguration_Name() {
return (EAttribute)namedConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -407,6 +424,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getAbstractAdviceBindingConfiguration() {
return abstractAdviceBindingConfigurationEClass;
}
@@ -416,6 +434,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAbstractAdviceBindingConfiguration_Target() {
return (EReference)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -425,6 +444,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAbstractAdviceBindingConfiguration_ContainerConfiguration() {
return (EReference)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -434,8 +454,9 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAbstractAdviceBindingConfiguration_MatcherConfiguration() {
- return (EReference)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(2);
+ return (EReference)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
@@ -443,8 +464,9 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getAbstractAdviceBindingConfiguration_Inheritance() {
- return (EAttribute)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)abstractAdviceBindingConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
@@ -452,6 +474,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getAdviceConfiguration() {
return adviceConfigurationEClass;
}
@@ -461,6 +484,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAdviceConfiguration_Before() {
return (EReference)adviceConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -470,6 +494,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAdviceConfiguration_After() {
return (EReference)adviceConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -479,6 +504,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getContainerConfiguration() {
return containerConfigurationEClass;
}
@@ -488,6 +514,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getContainerConfiguration_ContainerMatcherConfiguration() {
return (EReference)containerConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -497,6 +524,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getContainerConfiguration_EContainmentFeatures() {
return (EReference)containerConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -506,6 +534,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getAbstractMatcherConfiguration() {
return abstractMatcherConfigurationEClass;
}
@@ -515,6 +544,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getSpecializationTypeConfiguration() {
return specializationTypeConfigurationEClass;
}
@@ -524,6 +554,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSpecializationTypeConfiguration_EditHelperAdviceConfiguration() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -533,6 +564,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSpecializationTypeConfiguration_ContainerConfiguration() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -542,6 +574,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSpecializationTypeConfiguration_MatcherConfiguration() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(2);
}
@@ -551,6 +584,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSpecializationTypeConfiguration_SpecializedTypes() {
return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(3);
}
@@ -560,6 +594,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getAbstractEditHelperAdviceConfiguration() {
return abstractEditHelperAdviceConfigurationEClass;
}
@@ -569,6 +604,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getAbstractEditHelperAdviceConfiguration_Target() {
return (EReference)abstractEditHelperAdviceConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -578,6 +614,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getMetamodelTypeConfiguration() {
return metamodelTypeConfigurationEClass;
}
@@ -587,6 +624,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getMetamodelTypeConfiguration_EClass() {
return (EReference)metamodelTypeConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -596,6 +634,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMetamodelTypeConfiguration_EditHelperClassName() {
return (EAttribute)metamodelTypeConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -605,6 +644,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getEditHelperAdviceConfiguration() {
return editHelperAdviceConfigurationEClass;
}
@@ -614,6 +654,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getEditHelperAdviceConfiguration_EditHelperAdviceClassName() {
return (EAttribute)editHelperAdviceConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -623,6 +664,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getAdviceBindingConfiguration() {
return adviceBindingConfigurationEClass;
}
@@ -632,6 +674,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getAdviceBindingConfiguration_EditHelperAdviceClassName() {
return (EAttribute)adviceBindingConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -641,6 +684,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getMatcherConfiguration() {
return matcherConfigurationEClass;
}
@@ -650,6 +694,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMatcherConfiguration_MatcherClassName() {
return (EAttribute)matcherConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -659,6 +704,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getExternallyRegisteredType() {
return externallyRegisteredTypeEClass;
}
@@ -668,6 +714,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getExternallyRegisteredAdvice() {
return externallyRegisteredAdviceEClass;
}
@@ -677,6 +724,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EEnum getInheritanceKind() {
return inheritanceKindEEnum;
}
@@ -686,6 +734,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ElementTypesConfigurationsFactory getElementTypesConfigurationsFactory() {
return (ElementTypesConfigurationsFactory)getEFactoryInstance();
}
@@ -735,8 +784,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
abstractAdviceBindingConfigurationEClass = createEClass(ABSTRACT_ADVICE_BINDING_CONFIGURATION);
createEReference(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET);
createEReference(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION);
- createEReference(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION);
createEAttribute(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE);
+ createEReference(abstractAdviceBindingConfigurationEClass, ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION);
adviceConfigurationEClass = createEClass(ADVICE_CONFIGURATION);
createEReference(adviceConfigurationEClass, ADVICE_CONFIGURATION__BEFORE);
@@ -852,10 +901,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
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(abstractAdviceBindingConfigurationEClass, AbstractAdviceBindingConfiguration.class, "AbstractAdviceBindingConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getAbstractAdviceBindingConfiguration_Target(), this.getElementTypeConfiguration(), null, "target", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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_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);
+ 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);
initEClass(adviceConfigurationEClass, AdviceConfiguration.class, "AdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAdviceConfiguration_Before(), this.getAdviceConfiguration(), null, "before", null, 0, -1, AdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java
index 0c268072311..44ab4693e78 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java
@@ -103,6 +103,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getIconPath() {
return iconPath;
}
@@ -112,6 +113,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setIconPath(String newIconPath) {
String oldIconPath = iconPath;
iconPath = newIconPath;
@@ -124,6 +126,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getBundleId() {
return bundleId;
}
@@ -133,6 +136,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setBundleId(String newBundleId) {
String oldBundleId = bundleId;
bundleId = newBundleId;
@@ -217,7 +221,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (iconPath: ");
result.append(iconPath);
result.append(", bundleId: ");
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java
index 98ea3543b45..318d5134f16 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java
@@ -81,6 +81,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getMatcherClassName() {
return matcherClassName;
}
@@ -90,6 +91,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setMatcherClassName(String newMatcherClassName) {
String oldMatcherClassName = matcherClassName;
matcherClassName = newMatcherClassName;
@@ -164,7 +166,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (matcherClassName: ");
result.append(matcherClassName);
result.append(')');
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java
index a4971121be2..bda0295e7b5 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java
@@ -93,6 +93,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getEClass() {
if (eClass != null && eClass.eIsProxy()) {
InternalEObject oldEClass = (InternalEObject)eClass;
@@ -119,6 +120,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setEClass(EClass newEClass) {
EClass oldEClass = eClass;
eClass = newEClass;
@@ -131,6 +133,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getEditHelperClassName() {
return editHelperClassName;
}
@@ -140,6 +143,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setEditHelperClassName(String newEditHelperClassName) {
String oldEditHelperClassName = editHelperClassName;
editHelperClassName = newEditHelperClassName;
@@ -225,7 +229,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (editHelperClassName: ");
result.append(editHelperClassName);
result.append(')');
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
index 925c115884b..ded751d50dc 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
@@ -116,6 +116,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public AbstractEditHelperAdviceConfiguration getEditHelperAdviceConfiguration() {
return editHelperAdviceConfiguration;
}
@@ -140,6 +141,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration newEditHelperAdviceConfiguration) {
if (newEditHelperAdviceConfiguration != editHelperAdviceConfiguration) {
NotificationChain msgs = null;
@@ -159,6 +161,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ContainerConfiguration getContainerConfiguration() {
return containerConfiguration;
}
@@ -183,6 +186,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setContainerConfiguration(ContainerConfiguration newContainerConfiguration) {
if (newContainerConfiguration != containerConfiguration) {
NotificationChain msgs = null;
@@ -202,6 +206,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public AbstractMatcherConfiguration getMatcherConfiguration() {
return matcherConfiguration;
}
@@ -226,6 +231,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setMatcherConfiguration(AbstractMatcherConfiguration newMatcherConfiguration) {
if (newMatcherConfiguration != matcherConfiguration) {
NotificationChain msgs = null;
@@ -245,6 +251,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<ElementTypeConfiguration> getSpecializedTypes() {
if (specializedTypes == null) {
specializedTypes = new EObjectResolvingEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES);
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 a650ac2360d..7e5da158d8e 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
@@ -16,9 +16,7 @@ package org.eclipse.papyrus.infra.types.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
import org.eclipse.papyrus.infra.types.*;
/**
@@ -34,7 +32,7 @@ import org.eclipse.papyrus.infra.types.*;
* @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage
* @generated
*/
-public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
+public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->

Back to the top