Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2015-03-25 12:11:52 +0000
committerFlorian Noyrit2015-03-25 12:11:52 +0000
commit9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c (patch)
treee691a04ba22a8895ae18472176360c04753dad04 /plugins/infra
parent7f2d62b5093b9916e04219ddccb58f09195fc42f (diff)
downloadorg.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.tar.gz
org.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.tar.xz
org.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.zip
Fix elementTypesConfigurations tests.
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel58
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.ecore2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.genmodel10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties3
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml63
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java74
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java48
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java140
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java18
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java44
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java16
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java1
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationXMLProcessor.java60
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationFactory.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationPackage.java)73
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/ViewToDisplay.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java22
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationFactoryImpl.java)28
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationPackageImpl.java)40
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java22
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java111
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java18
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory.java)112
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationXMLProcessor.java60
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationAdapterFactory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationAdapterFactory.java)35
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl.java)10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceImpl.java)9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationSwitch.java (renamed from plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationSwitch.java)35
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java153
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gifbin223 -> 102 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gifbin223 -> 94 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gifbin223 -> 94 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gifbin223 -> 102 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gifbin223 -> 94 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gifbin129 -> 102 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gifbin129 -> 94 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gifbin129 -> 94 bytes
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml15
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java11
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java24
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java68
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java77
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java148
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java97
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java33
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java9
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java5
72 files changed, 1137 insertions, 721 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
index 5c7f7db44c3..d0fa9393e0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
org.eclipse.papyrus.views.properties;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0";visibility:=reexport
+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif
new file mode 100644
index 00000000000..5389eace04f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
index 9e5f791ba46..5f1bc1d20d2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
@@ -8,8 +8,11 @@
eType="#//HierarchyPermission" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="childType" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPermitted" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStrict" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"
+ eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel
index 32ecbcad1ac..9e0e9c412c0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel
@@ -1,25 +1,37 @@
<?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/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
- modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
- editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
- editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen"
- modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" modelName="InvariantContainerRuleConfiguration"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="7.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
- editorPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.editor" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"
- operationReflection="true" importOrganizing="true">
- <foreignModel>InvariantContainerRuleConfiguration.ecore</foreignModel>
- <genPackages prefix="InvariantContainerRuleConfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
- resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
- ecorePackage="InvariantContainerRuleConfiguration.ecore#/">
- <genClasses ecoreClass="InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration/permissions"/>
- </genClasses>
- <genClasses ecoreClass="InvariantContainerRuleConfiguration.ecore#//HierarchyPermission">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/childType"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isPermitted"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isStrict"/>
- </genClasses>
- </genPackages>
+<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/emf/2002/GenModel"
+ copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+ modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
+ editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
+ editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen"
+ modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
+ modelName="InvariantContainerRuleConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0"
+ copyrightFields="false"
+ editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
+ editorPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.editor"
+ usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"
+ operationReflection="true" importOrganizing="true">
+ <foreignModel>InvariantContainerRuleConfiguration.ecore</foreignModel>
+ <genPackages prefix="InvariantContainerRuleConfiguration"
+ basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
+ resource="XMI" disposableProviderFactory="true"
+ childCreationExtenders="true" ecorePackage="InvariantContainerRuleConfiguration.ecore#/">
+ <genClasses
+ ecoreClass="InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration">
+ <genFeatures property="None" children="true" createChild="true"
+ ecoreFeature="ecore:EReference InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration/permissions" />
+ </genClasses>
+ <genClasses
+ ecoreClass="InvariantContainerRuleConfiguration.ecore#//HierarchyPermission">
+ <genFeatures createChild="false"
+ ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/childType" />
+ <genFeatures createChild="false"
+ ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isPermitted" />
+ <genFeatures createChild="false"
+ ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isStrict" />
+ </genClasses>
+ </genPackages>
</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.ecore
index 9e9197531b5..9069180cc33 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.ecore
@@ -3,7 +3,7 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="runtimevalueseditionadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"
nsPrefix="runtimevalueseditionadviceconfiguration">
<eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionAdviceConfiguration"
- eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AdviceConfiguration">
+ eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AdviceBindingConfiguration">
<eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
eType="#//ViewToDisplay" containment="true"/>
</eClassifiers>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.genmodel
index accfd97a119..96e8a6bdba8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/RuntimeValuesEditionAdviceConfiguration.genmodel
@@ -5,11 +5,13 @@
editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.editor/src-gen"
modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" modelName="RuntimeValuesEditionAdviceConfiguration"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="7.0" copyrightFields="false" language="" usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel#//properties"
- operationReflection="true" importOrganizing="true">
+ editPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin"
+ editorPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.presentation.RuntimeValuesEditionAdviceConfigurationEditorPlugin"
+ testSuiteClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.tests.RuntimeValuesEditionAdviceConfigurationAllTests"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+ editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations ../../org.eclipse.papyrus.views.properties.model/Model/Properties.genmodel#//properties">
<foreignModel>RuntimeValuesEditionAdviceConfiguration.ecore</foreignModel>
- <genPackages prefix="RuntimeValuesEditionAdviceConfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
+ <genPackages prefix="Runtimevalueseditionadviceconfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
ecorePackage="RuntimeValuesEditionAdviceConfiguration.ecore#/">
<genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration">
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties
index 92340c6b3dc..db9976a2ed3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties
@@ -39,3 +39,6 @@ _UI_InvariantContainerRuleConfiguration_permissions_feature = Permissions
_UI_HierarchyPermission_childType_feature = Child Type
_UI_HierarchyPermission_isPermitted_feature = Is Permitted
_UI_HierarchyPermission_isStrict_feature = Is Strict
+_UI_HierarchyPermission_strict_feature = Strict
+_UI_HierarchyPermission_containerType_feature = Container Type
+_UI_HierarchyPermission_permitted_feature = Permitted
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
index 0df37c13a49..408385ca2c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
@@ -9,33 +9,6 @@
<extension point="org.eclipse.emf.ecore.generated_package">
- <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
- <package
- uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"
- class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage"
- genModel="model/RuntimeValuesEditionAdviceConfiguration.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
- <parser
- type="runtimevalueseditionadviceconfiguration"
- class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl"/>
- </extension>
-
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
- <factory
- uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"
- class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory"
- supportedTypes=
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource"/>
- </extension>
- <extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated SetValuesAdviceConfiguration -->
<package
uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.0"
@@ -103,7 +76,41 @@
uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"
class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>
</extension>
- <extension
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
+ <package
+ uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"
+ class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage"
+ genModel="model/RuntimeValuesEditionAdviceConfiguration.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
+ <parser
+ type="runtimevalueseditionadviceconfiguration"
+ class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceFactoryImpl"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
+ <factory
+ uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"
+ class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.provider.RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.edit.childCreationExtenders">
+ <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
+ <extender
+ uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+ class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.provider.RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
+ </extension>
+ <extension
point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
<adviceConfigurationType
configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration"
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java
index 572f9872c08..0de72cbddc3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission()
* @model
@@ -34,81 +34,81 @@ import org.eclipse.emf.ecore.EObject;
*/
public interface HierarchyPermission extends EObject {
/**
- * Returns the value of the '<em><b>Child Type</b></em>' attribute.
+ * Returns the value of the '<em><b>Container Type</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Child Type</em>' attribute isn't clear,
+ * If the meaning of the '<em>Container Type</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Child Type</em>' attribute.
- * @see #setChildType(String)
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_ChildType()
- * @model
+ * @return the value of the '<em>Container Type</em>' attribute.
+ * @see #setContainerType(String)
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_ContainerType()
+ * @model required="true"
* @generated
*/
- String getChildType();
+ String getContainerType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Child Type</em>' attribute.
- * @see #getChildType()
+ * @param value the new value of the '<em>Container Type</em>' attribute.
+ * @see #getContainerType()
* @generated
*/
- void setChildType(String value);
+ void setContainerType(String value);
/**
- * Returns the value of the '<em><b>Is Permitted</b></em>' attribute.
+ * Returns the value of the '<em><b>Permitted</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Is Permitted</em>' attribute isn't clear,
+ * If the meaning of the '<em>Permitted</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Is Permitted</em>' attribute.
- * @see #setIsPermitted(boolean)
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_IsPermitted()
- * @model
+ * @return the value of the '<em>Permitted</em>' attribute.
+ * @see #setPermitted(boolean)
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_Permitted()
+ * @model required="true"
* @generated
*/
- boolean isIsPermitted();
+ boolean isPermitted();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Is Permitted</em>' attribute.
- * @see #isIsPermitted()
+ * @param value the new value of the '<em>Permitted</em>' attribute.
+ * @see #isPermitted()
* @generated
*/
- void setIsPermitted(boolean value);
+ void setPermitted(boolean value);
/**
- * Returns the value of the '<em><b>Is Strict</b></em>' attribute.
+ * Returns the value of the '<em><b>Strict</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Is Strict</em>' attribute isn't clear,
+ * If the meaning of the '<em>Strict</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Is Strict</em>' attribute.
- * @see #setIsStrict(boolean)
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_IsStrict()
- * @model
+ * @return the value of the '<em>Strict</em>' attribute.
+ * @see #setStrict(boolean)
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_Strict()
+ * @model required="true"
* @generated
*/
- boolean isIsStrict();
+ boolean isStrict();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Is Strict</em>' attribute.
- * @see #isIsStrict()
+ * @param value the new value of the '<em>Strict</em>' attribute.
+ * @see #isStrict()
* @generated
*/
- void setIsStrict(boolean value);
+ void setStrict(boolean value);
} // HierarchyPermission
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java
index 1f3083661ac..7299841acde 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java
@@ -23,10 +23,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration#getPermissions <em>Permissions</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getInvariantContainerRuleConfiguration()
* @model
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java
index 32d3d13b766..fc749c980cb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java
@@ -116,31 +116,31 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
int HIERARCHY_PERMISSION = 1;
/**
- * The feature id for the '<em><b>Child Type</b></em>' attribute.
+ * The feature id for the '<em><b>Container Type</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HIERARCHY_PERMISSION__CHILD_TYPE = 0;
+ int HIERARCHY_PERMISSION__CONTAINER_TYPE = 0;
/**
- * The feature id for the '<em><b>Is Permitted</b></em>' attribute.
+ * The feature id for the '<em><b>Permitted</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HIERARCHY_PERMISSION__IS_PERMITTED = 1;
+ int HIERARCHY_PERMISSION__PERMITTED = 1;
/**
- * The feature id for the '<em><b>Is Strict</b></em>' attribute.
+ * The feature id for the '<em><b>Strict</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HIERARCHY_PERMISSION__IS_STRICT = 2;
+ int HIERARCHY_PERMISSION__STRICT = 2;
/**
* The number of structural features of the '<em>Hierarchy Permission</em>' class.
@@ -193,37 +193,37 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
EClass getHierarchyPermission();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Child Type</em>'.
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getChildType()
+ * @return the meta object for the attribute '<em>Container Type</em>'.
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType()
* @see #getHierarchyPermission()
* @generated
*/
- EAttribute getHierarchyPermission_ChildType();
+ EAttribute getHierarchyPermission_ContainerType();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Is Permitted</em>'.
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsPermitted()
+ * @return the meta object for the attribute '<em>Permitted</em>'.
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted()
* @see #getHierarchyPermission()
* @generated
*/
- EAttribute getHierarchyPermission_IsPermitted();
+ EAttribute getHierarchyPermission_Permitted();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Is Strict</em>'.
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isIsStrict()
+ * @return the meta object for the attribute '<em>Strict</em>'.
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict()
* @see #getHierarchyPermission()
* @generated
*/
- EAttribute getHierarchyPermission_IsStrict();
+ EAttribute getHierarchyPermission_Strict();
/**
* Returns the factory that creates the instances of the model.
@@ -277,28 +277,28 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
EClass HIERARCHY_PERMISSION = eINSTANCE.getHierarchyPermission();
/**
- * The meta object literal for the '<em><b>Child Type</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Container Type</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute HIERARCHY_PERMISSION__CHILD_TYPE = eINSTANCE.getHierarchyPermission_ChildType();
+ EAttribute HIERARCHY_PERMISSION__CONTAINER_TYPE = eINSTANCE.getHierarchyPermission_ContainerType();
/**
- * The meta object literal for the '<em><b>Is Permitted</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Permitted</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute HIERARCHY_PERMISSION__IS_PERMITTED = eINSTANCE.getHierarchyPermission_IsPermitted();
+ EAttribute HIERARCHY_PERMISSION__PERMITTED = eINSTANCE.getHierarchyPermission_Permitted();
/**
- * The meta object literal for the '<em><b>Is Strict</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Strict</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute HIERARCHY_PERMISSION__IS_STRICT = eINSTANCE.getHierarchyPermission_IsStrict();
+ EAttribute HIERARCHY_PERMISSION__STRICT = eINSTANCE.getHierarchyPermission_Strict();
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java
index 9925a15b1db..501bca5e089 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java
@@ -28,75 +28,75 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontain
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#getChildType <em>Child Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isIsPermitted <em>Is Permitted</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isIsStrict <em>Is Strict</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#getContainerType <em>Container Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isPermitted <em>Permitted</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isStrict <em>Strict</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implements HierarchyPermission {
/**
- * The default value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
+ * The default value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getChildType()
+ * @see #getContainerType()
* @generated
* @ordered
*/
- protected static final String CHILD_TYPE_EDEFAULT = null;
+ protected static final String CONTAINER_TYPE_EDEFAULT = null;
/**
- * The cached value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
+ * The cached value of the '{@link #getContainerType() <em>Container Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getChildType()
+ * @see #getContainerType()
* @generated
* @ordered
*/
- protected String childType = CHILD_TYPE_EDEFAULT;
+ protected String containerType = CONTAINER_TYPE_EDEFAULT;
/**
- * The default value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
+ * The default value of the '{@link #isPermitted() <em>Permitted</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isIsPermitted()
+ * @see #isPermitted()
* @generated
* @ordered
*/
- protected static final boolean IS_PERMITTED_EDEFAULT = false;
+ protected static final boolean PERMITTED_EDEFAULT = false;
/**
- * The cached value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
+ * The cached value of the '{@link #isPermitted() <em>Permitted</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isIsPermitted()
+ * @see #isPermitted()
* @generated
* @ordered
*/
- protected boolean isPermitted = IS_PERMITTED_EDEFAULT;
+ protected boolean permitted = PERMITTED_EDEFAULT;
/**
- * The default value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
+ * The default value of the '{@link #isStrict() <em>Strict</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isIsStrict()
+ * @see #isStrict()
* @generated
* @ordered
*/
- protected static final boolean IS_STRICT_EDEFAULT = false;
+ protected static final boolean STRICT_EDEFAULT = false;
/**
- * The cached value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
+ * The cached value of the '{@link #isStrict() <em>Strict</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #isIsStrict()
+ * @see #isStrict()
* @generated
* @ordered
*/
- protected boolean isStrict = IS_STRICT_EDEFAULT;
+ protected boolean strict = STRICT_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -122,8 +122,8 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public String getChildType() {
- return childType;
+ public String getContainerType() {
+ return containerType;
}
/**
@@ -131,11 +131,11 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public void setChildType(String newChildType) {
- String oldChildType = childType;
- childType = newChildType;
+ public void setContainerType(String newContainerType) {
+ String oldContainerType = containerType;
+ containerType = newContainerType;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE, oldChildType, childType));
+ eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE, oldContainerType, containerType));
}
/**
@@ -143,8 +143,8 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public boolean isIsPermitted() {
- return isPermitted;
+ public boolean isPermitted() {
+ return permitted;
}
/**
@@ -152,11 +152,11 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public void setIsPermitted(boolean newIsPermitted) {
- boolean oldIsPermitted = isPermitted;
- isPermitted = newIsPermitted;
+ public void setPermitted(boolean newPermitted) {
+ boolean oldPermitted = permitted;
+ permitted = newPermitted;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED, oldIsPermitted, isPermitted));
+ eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED, oldPermitted, permitted));
}
/**
@@ -164,8 +164,8 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public boolean isIsStrict() {
- return isStrict;
+ public boolean isStrict() {
+ return strict;
}
/**
@@ -173,11 +173,11 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public void setIsStrict(boolean newIsStrict) {
- boolean oldIsStrict = isStrict;
- isStrict = newIsStrict;
+ public void setStrict(boolean newStrict) {
+ boolean oldStrict = strict;
+ strict = newStrict;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT, oldIsStrict, isStrict));
+ eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT, oldStrict, strict));
}
/**
@@ -188,12 +188,12 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
- return getChildType();
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
- return isIsPermitted();
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
- return isIsStrict();
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+ return getContainerType();
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+ return isPermitted();
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+ return isStrict();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -206,14 +206,14 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
- setChildType((String)newValue);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+ setContainerType((String)newValue);
return;
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
- setIsPermitted((Boolean)newValue);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+ setPermitted((Boolean)newValue);
return;
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
- setIsStrict((Boolean)newValue);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+ setStrict((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -227,14 +227,14 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
- setChildType(CHILD_TYPE_EDEFAULT);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+ setContainerType(CONTAINER_TYPE_EDEFAULT);
return;
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
- setIsPermitted(IS_PERMITTED_EDEFAULT);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+ setPermitted(PERMITTED_EDEFAULT);
return;
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
- setIsStrict(IS_STRICT_EDEFAULT);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+ setStrict(STRICT_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -248,12 +248,12 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
- return CHILD_TYPE_EDEFAULT == null ? childType != null : !CHILD_TYPE_EDEFAULT.equals(childType);
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
- return isPermitted != IS_PERMITTED_EDEFAULT;
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
- return isStrict != IS_STRICT_EDEFAULT;
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+ return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+ return permitted != PERMITTED_EDEFAULT;
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+ return strict != STRICT_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -268,12 +268,12 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (childType: ");
- result.append(childType);
- result.append(", isPermitted: ");
- result.append(isPermitted);
- result.append(", isStrict: ");
- result.append(isStrict);
+ result.append(" (containerType: ");
+ result.append(containerType);
+ result.append(", permitted: ");
+ result.append(permitted);
+ result.append(", strict: ");
+ result.append(strict);
result.append(')');
return result.toString();
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java
index a3daf3f0269..e5e3de827ef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java
@@ -36,10 +36,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl#getPermissions <em>Permissions</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java
index 00656e33014..297b8f2c604 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java
@@ -144,7 +144,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getHierarchyPermission_ChildType() {
+ public EAttribute getHierarchyPermission_ContainerType() {
return (EAttribute)hierarchyPermissionEClass.getEStructuralFeatures().get(0);
}
@@ -153,7 +153,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getHierarchyPermission_IsPermitted() {
+ public EAttribute getHierarchyPermission_Permitted() {
return (EAttribute)hierarchyPermissionEClass.getEStructuralFeatures().get(1);
}
@@ -162,7 +162,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getHierarchyPermission_IsStrict() {
+ public EAttribute getHierarchyPermission_Strict() {
return (EAttribute)hierarchyPermissionEClass.getEStructuralFeatures().get(2);
}
@@ -198,9 +198,9 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
createEReference(invariantContainerRuleConfigurationEClass, INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS);
hierarchyPermissionEClass = createEClass(HIERARCHY_PERMISSION);
- createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__CHILD_TYPE);
- createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_PERMITTED);
- createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_STRICT);
+ createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__CONTAINER_TYPE);
+ createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__PERMITTED);
+ createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__STRICT);
}
/**
@@ -242,9 +242,9 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
initEReference(getInvariantContainerRuleConfiguration_Permissions(), this.getHierarchyPermission(), null, "permissions", null, 0, -1, InvariantContainerRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(hierarchyPermissionEClass, HierarchyPermission.class, "HierarchyPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getHierarchyPermission_ChildType(), theEcorePackage.getEString(), "childType", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getHierarchyPermission_IsPermitted(), theEcorePackage.getEBoolean(), "isPermitted", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getHierarchyPermission_IsStrict(), theEcorePackage.getEBoolean(), "isStrict", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getHierarchyPermission_ContainerType(), theEcorePackage.getEString(), "containerType", null, 1, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getHierarchyPermission_Permitted(), theEcorePackage.getEBoolean(), "permitted", null, 1, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getHierarchyPermission_Strict(), theEcorePackage.getEBoolean(), "strict", null, 1, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java
index 683c5ff626c..54d51f85bbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java
@@ -70,27 +70,27 @@ public class HierarchyPermissionItemProvider
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addChildTypePropertyDescriptor(object);
- addIsPermittedPropertyDescriptor(object);
- addIsStrictPropertyDescriptor(object);
+ addContainerTypePropertyDescriptor(object);
+ addPermittedPropertyDescriptor(object);
+ addStrictPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Child Type feature.
+ * This adds a property descriptor for the Container Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addChildTypePropertyDescriptor(Object object) {
+ protected void addContainerTypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_HierarchyPermission_childType_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_childType_feature", "_UI_HierarchyPermission_type"),
- InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__CHILD_TYPE,
+ getString("_UI_HierarchyPermission_containerType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_containerType_feature", "_UI_HierarchyPermission_type"),
+ InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__CONTAINER_TYPE,
true,
false,
false,
@@ -100,19 +100,19 @@ public class HierarchyPermissionItemProvider
}
/**
- * This adds a property descriptor for the Is Permitted feature.
+ * This adds a property descriptor for the Permitted feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addIsPermittedPropertyDescriptor(Object object) {
+ protected void addPermittedPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_HierarchyPermission_isPermitted_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isPermitted_feature", "_UI_HierarchyPermission_type"),
- InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_PERMITTED,
+ getString("_UI_HierarchyPermission_permitted_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_permitted_feature", "_UI_HierarchyPermission_type"),
+ InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__PERMITTED,
true,
false,
false,
@@ -122,19 +122,19 @@ public class HierarchyPermissionItemProvider
}
/**
- * This adds a property descriptor for the Is Strict feature.
+ * This adds a property descriptor for the Strict feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addIsStrictPropertyDescriptor(Object object) {
+ protected void addStrictPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_HierarchyPermission_isStrict_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isStrict_feature", "_UI_HierarchyPermission_type"),
- InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_STRICT,
+ getString("_UI_HierarchyPermission_strict_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_strict_feature", "_UI_HierarchyPermission_type"),
+ InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__STRICT,
true,
false,
false,
@@ -162,7 +162,7 @@ public class HierarchyPermissionItemProvider
*/
@Override
public String getText(Object object) {
- String label = ((HierarchyPermission)object).getChildType();
+ String label = ((HierarchyPermission)object).getContainerType();
return label == null || label.length() == 0 ?
getString("_UI_HierarchyPermission_type") :
getString("_UI_HierarchyPermission_type") + " " + label;
@@ -181,9 +181,9 @@ public class HierarchyPermissionItemProvider
updateChildren(notification);
switch (notification.getFeatureID(HierarchyPermission.class)) {
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
- case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+ case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java
index 8211c7ff8bf..037edd7754f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontain
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationSwitch;
@@ -323,6 +324,21 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
* <!-- end-user-doc -->
* @generated
*/
+ @Override
+ public Object caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
+ InvariantContainerRuleConfigurationFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
+
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
protected CommandParameter createChildParameter(Object feature, Object child) {
return new CommandParameter(null, feature, child);
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java
index 8b49b542396..958399e6cfa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java
@@ -13,6 +13,7 @@
package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
import org.eclipse.emf.common.util.URI;
+
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java
index 0a78b8fe5d6..de5df72805a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java
@@ -59,7 +59,7 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationXMLProcessor.java
deleted file mode 100644
index a364f8cefe2..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InvariantContainerRuleConfigurationXMLProcessor extends XMLProcessor {
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InvariantContainerRuleConfigurationXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- InvariantContainerRuleConfigurationPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the InvariantContainerRuleConfigurationResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected Map<String, Resource.Factory> getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new InvariantContainerRuleConfigurationResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new InvariantContainerRuleConfigurationResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //InvariantContainerRuleConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java
index 735e890d04c..3fd1a8cea3f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesed
import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
/**
* <!-- begin-user-doc -->
@@ -23,16 +23,16 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>
* </ul>
- * </p>
*
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage#getRuntimeValuesEditionAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getRuntimeValuesEditionAdviceConfiguration()
* @model
* @generated
*/
-public interface RuntimeValuesEditionAdviceConfiguration extends AdviceConfiguration {
+public interface RuntimeValuesEditionAdviceConfiguration extends AdviceBindingConfiguration {
/**
* Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay}.
@@ -43,7 +43,7 @@ public interface RuntimeValuesEditionAdviceConfiguration extends AdviceConfigura
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Views To Display</em>' containment reference list.
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage#getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay()
* @model containment="true"
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java
index c8dd60a41a7..f379e3642d0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java
@@ -19,17 +19,17 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
* @generated
*/
-public interface RuntimeValuesEditionAdviceConfigurationFactory extends EFactory {
+public interface RuntimevalueseditionadviceconfigurationFactory extends EFactory {
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- RuntimeValuesEditionAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationFactoryImpl.init();
+ RuntimevalueseditionadviceconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationFactoryImpl.init();
/**
* Returns a new object of class '<em>Runtime Values Edition Advice Configuration</em>'.
@@ -56,6 +56,6 @@ public interface RuntimeValuesEditionAdviceConfigurationFactory extends EFactory
* @return the package supported by this factory.
* @generated
*/
- RuntimeValuesEditionAdviceConfigurationPackage getRuntimeValuesEditionAdviceConfigurationPackage();
+ RuntimevalueseditionadviceconfigurationPackage getRuntimevalueseditionadviceconfigurationPackage();
-} //RuntimeValuesEditionAdviceConfigurationFactory
+} //RuntimevalueseditionadviceconfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java
index 51b971bee93..b2b16c7b945 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfigurationPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java
@@ -25,16 +25,15 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
* <ul>
* <li>each class,</li>
* <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory
* @model kind="package"
* @generated
*/
-public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage {
+public interface RuntimevalueseditionadviceconfigurationPackage extends EPackage {
/**
* The package name.
* <!-- begin-user-doc -->
@@ -65,14 +64,14 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- RuntimeValuesEditionAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationPackageImpl.init();
+ RuntimevalueseditionadviceconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl.init();
/**
* The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl <em>Runtime Values Edition Advice Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
* @generated
*/
int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION = 0;
@@ -84,7 +83,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__NAME = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__NAME;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__NAME = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__NAME;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -93,7 +92,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__DESCRIPTION;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
/**
* The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -102,7 +101,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__IDENTIFIER;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
/**
* The feature id for the '<em><b>Edit Helper Advice Class Name</b></em>' attribute.
@@ -111,7 +110,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME;
/**
* The feature id for the '<em><b>Before</b></em>' attribute list.
@@ -120,7 +119,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__BEFORE;
/**
* The feature id for the '<em><b>After</b></em>' attribute list.
@@ -129,7 +128,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__AFTER;
/**
* The feature id for the '<em><b>Inheritance</b></em>' attribute.
@@ -138,71 +137,80 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__INHERITANCE;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__INHERITANCE;
/**
- * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
+ * The feature id for the '<em><b>Target</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION_FEATURE_COUNT + 0;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__TARGET = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__TARGET;
/**
- * The number of structural features of the '<em>Runtime Values Edition Advice Configuration</em>' class.
+ * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION_FEATURE_COUNT + 1;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
/**
- * The number of operations of the '<em>Runtime Values Edition Advice Configuration</em>' class.
+ * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION_OPERATION_COUNT + 0;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+ * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationPackageImpl#getViewToDisplay()
* @generated
+ * @ordered
*/
- int VIEW_TO_DISPLAY = 1;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>View</b></em>' reference.
+ * The number of structural features of the '<em>Runtime Values Edition Advice Configuration</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VIEW_TO_DISPLAY__VIEW = 0;
+ int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>View To Display</em>' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getViewToDisplay()
+ * @generated
+ */
+ int VIEW_TO_DISPLAY = 1;
+
+ /**
+ * The feature id for the '<em><b>View</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
+ int VIEW_TO_DISPLAY__VIEW = 0;
/**
- * The number of operations of the '<em>View To Display</em>' class.
+ * The number of structural features of the '<em>View To Display</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VIEW_TO_DISPLAY_OPERATION_COUNT = 0;
+ int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
/**
@@ -254,7 +262,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* @return the factory that creates the instances of the model.
* @generated
*/
- RuntimeValuesEditionAdviceConfigurationFactory getRuntimeValuesEditionAdviceConfigurationFactory();
+ RuntimevalueseditionadviceconfigurationFactory getRuntimevalueseditionadviceconfigurationFactory();
/**
* <!-- begin-user-doc -->
@@ -262,7 +270,6 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* <ul>
* <li>each class,</li>
* <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
@@ -275,7 +282,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
* @generated
*/
EClass RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION = eINSTANCE.getRuntimeValuesEditionAdviceConfiguration();
@@ -293,7 +300,7 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationPackageImpl#getViewToDisplay()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getViewToDisplay()
* @generated
*/
EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();
@@ -308,4 +315,4 @@ public interface RuntimeValuesEditionAdviceConfigurationPackage extends EPackage
}
-} //RuntimeValuesEditionAdviceConfigurationPackage
+} //RuntimevalueseditionadviceconfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/ViewToDisplay.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/ViewToDisplay.java
index e37f925f628..c8caab0e77b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/ViewToDisplay.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/ViewToDisplay.java
@@ -23,12 +23,12 @@ import org.eclipse.papyrus.views.properties.contexts.View;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay#getView <em>View</em>}</li>
* </ul>
- * </p>
*
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage#getViewToDisplay()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getViewToDisplay()
* @model
* @generated
*/
@@ -43,7 +43,7 @@ public interface ViewToDisplay extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>View</em>' reference.
* @see #setView(View)
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage#getViewToDisplay_View()
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getViewToDisplay_View()
* @model required="true"
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java
index 4d9e46d7140..986e60b7057 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl;
/**
* <!-- begin-user-doc -->
@@ -36,14 +36,14 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigura
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigurationImpl implements RuntimeValuesEditionAdviceConfiguration {
+public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceBindingConfigurationImpl implements RuntimeValuesEditionAdviceConfiguration {
/**
* The cached value of the '{@link #getViewsToDisplay() <em>Views To Display</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -70,7 +70,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
*/
@Override
protected EClass eStaticClass() {
- return RuntimeValuesEditionAdviceConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION;
+ return RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION;
}
/**
@@ -80,7 +80,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
*/
public EList<ViewToDisplay> getViewsToDisplay() {
if (viewsToDisplay == null) {
- viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
+ viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
}
return viewsToDisplay;
}
@@ -93,7 +93,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
return ((InternalEList<?>)getViewsToDisplay()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -107,7 +107,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
return getViewsToDisplay();
}
return super.eGet(featureID, resolve, coreType);
@@ -122,7 +122,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
getViewsToDisplay().clear();
getViewsToDisplay().addAll((Collection<? extends ViewToDisplay>)newValue);
return;
@@ -138,7 +138,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
getViewsToDisplay().clear();
return;
}
@@ -153,7 +153,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AdviceConfigura
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
return viewsToDisplay != null && !viewsToDisplay.isEmpty();
}
return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java
index c64d58f194b..bc0d2e133c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesedi
* <!-- end-user-doc -->
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationFactoryImpl extends EFactoryImpl implements RuntimeValuesEditionAdviceConfigurationFactory {
+public class RuntimevalueseditionadviceconfigurationFactoryImpl extends EFactoryImpl implements RuntimevalueseditionadviceconfigurationFactory {
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static RuntimeValuesEditionAdviceConfigurationFactory init() {
+ public static RuntimevalueseditionadviceconfigurationFactory init() {
try {
- RuntimeValuesEditionAdviceConfigurationFactory theRuntimeValuesEditionAdviceConfigurationFactory = (RuntimeValuesEditionAdviceConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(RuntimeValuesEditionAdviceConfigurationPackage.eNS_URI);
- if (theRuntimeValuesEditionAdviceConfigurationFactory != null) {
- return theRuntimeValuesEditionAdviceConfigurationFactory;
+ RuntimevalueseditionadviceconfigurationFactory theRuntimevalueseditionadviceconfigurationFactory = (RuntimevalueseditionadviceconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(RuntimevalueseditionadviceconfigurationPackage.eNS_URI);
+ if (theRuntimevalueseditionadviceconfigurationFactory != null) {
+ return theRuntimevalueseditionadviceconfigurationFactory;
}
}
catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
- return new RuntimeValuesEditionAdviceConfigurationFactoryImpl();
+ return new RuntimevalueseditionadviceconfigurationFactoryImpl();
}
/**
@@ -54,7 +54,7 @@ public class RuntimeValuesEditionAdviceConfigurationFactoryImpl extends EFactory
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationFactoryImpl() {
+ public RuntimevalueseditionadviceconfigurationFactoryImpl() {
super();
}
@@ -66,8 +66,8 @@ public class RuntimeValuesEditionAdviceConfigurationFactoryImpl extends EFactory
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: return createRuntimeValuesEditionAdviceConfiguration();
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY: return createViewToDisplay();
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: return createRuntimeValuesEditionAdviceConfiguration();
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY: return createViewToDisplay();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -98,8 +98,8 @@ public class RuntimeValuesEditionAdviceConfigurationFactoryImpl extends EFactory
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationPackage getRuntimeValuesEditionAdviceConfigurationPackage() {
- return (RuntimeValuesEditionAdviceConfigurationPackage)getEPackage();
+ public RuntimevalueseditionadviceconfigurationPackage getRuntimevalueseditionadviceconfigurationPackage() {
+ return (RuntimevalueseditionadviceconfigurationPackage)getEPackage();
}
/**
@@ -109,8 +109,8 @@ public class RuntimeValuesEditionAdviceConfigurationFactoryImpl extends EFactory
* @generated
*/
@Deprecated
- public static RuntimeValuesEditionAdviceConfigurationPackage getPackage() {
- return RuntimeValuesEditionAdviceConfigurationPackage.eINSTANCE;
+ public static RuntimevalueseditionadviceconfigurationPackage getPackage() {
+ return RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
}
-} //RuntimeValuesEditionAdviceConfigurationFactoryImpl
+} //RuntimevalueseditionadviceconfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java
index e8ddd8200dc..134344bdf26 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay;
import org.eclipse.papyrus.views.properties.contexts.ContextsPackage;
@@ -37,7 +37,7 @@ import org.eclipse.papyrus.views.properties.ui.UiPackage;
* <!-- end-user-doc -->
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackageImpl implements RuntimeValuesEditionAdviceConfigurationPackage {
+public class RuntimevalueseditionadviceconfigurationPackageImpl extends EPackageImpl implements RuntimevalueseditionadviceconfigurationPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -63,12 +63,12 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#eNS_URI
* @see #init()
* @generated
*/
- private RuntimeValuesEditionAdviceConfigurationPackageImpl() {
- super(eNS_URI, RuntimeValuesEditionAdviceConfigurationFactory.eINSTANCE);
+ private RuntimevalueseditionadviceconfigurationPackageImpl() {
+ super(eNS_URI, RuntimevalueseditionadviceconfigurationFactory.eINSTANCE);
}
/**
@@ -81,7 +81,7 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
/**
* 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 RuntimeValuesEditionAdviceConfigurationPackage#eINSTANCE} when that field is accessed.
+ * <p>This method is used to initialize {@link RuntimevalueseditionadviceconfigurationPackage#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 -->
* <!-- end-user-doc -->
@@ -90,11 +90,11 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
* @see #initializePackageContents()
* @generated
*/
- public static RuntimeValuesEditionAdviceConfigurationPackage init() {
- if (isInited) return (RuntimeValuesEditionAdviceConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(RuntimeValuesEditionAdviceConfigurationPackage.eNS_URI);
+ public static RuntimevalueseditionadviceconfigurationPackage init() {
+ if (isInited) return (RuntimevalueseditionadviceconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(RuntimevalueseditionadviceconfigurationPackage.eNS_URI);
// Obtain or create and register package
- RuntimeValuesEditionAdviceConfigurationPackageImpl theRuntimeValuesEditionAdviceConfigurationPackage = (RuntimeValuesEditionAdviceConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimeValuesEditionAdviceConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RuntimeValuesEditionAdviceConfigurationPackageImpl());
+ RuntimevalueseditionadviceconfigurationPackageImpl theRuntimevalueseditionadviceconfigurationPackage = (RuntimevalueseditionadviceconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimevalueseditionadviceconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RuntimevalueseditionadviceconfigurationPackageImpl());
isInited = true;
@@ -105,18 +105,18 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
UiPackage.eINSTANCE.eClass();
// Create package meta-data objects
- theRuntimeValuesEditionAdviceConfigurationPackage.createPackageContents();
+ theRuntimevalueseditionadviceconfigurationPackage.createPackageContents();
// Initialize created meta-data
- theRuntimeValuesEditionAdviceConfigurationPackage.initializePackageContents();
+ theRuntimevalueseditionadviceconfigurationPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
- theRuntimeValuesEditionAdviceConfigurationPackage.freeze();
+ theRuntimevalueseditionadviceconfigurationPackage.freeze();
// Update the registry and return the package
- EPackage.Registry.INSTANCE.put(RuntimeValuesEditionAdviceConfigurationPackage.eNS_URI, theRuntimeValuesEditionAdviceConfigurationPackage);
- return theRuntimeValuesEditionAdviceConfigurationPackage;
+ EPackage.Registry.INSTANCE.put(RuntimevalueseditionadviceconfigurationPackage.eNS_URI, theRuntimevalueseditionadviceconfigurationPackage);
+ return theRuntimevalueseditionadviceconfigurationPackage;
}
/**
@@ -160,8 +160,8 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationFactory getRuntimeValuesEditionAdviceConfigurationFactory() {
- return (RuntimeValuesEditionAdviceConfigurationFactory)getEFactoryInstance();
+ public RuntimevalueseditionadviceconfigurationFactory getRuntimevalueseditionadviceconfigurationFactory() {
+ return (RuntimevalueseditionadviceconfigurationFactory)getEFactoryInstance();
}
/**
@@ -222,9 +222,9 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
// Set bounds for type parameters
// Add supertypes to classes
- runtimeValuesEditionAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAdviceConfiguration());
+ runtimeValuesEditionAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAdviceBindingConfiguration());
- // Initialize classes, features, and operations; add parameters
+ // Initialize classes and features; add operations and parameters
initEClass(runtimeValuesEditionAdviceConfigurationEClass, RuntimeValuesEditionAdviceConfiguration.class, "RuntimeValuesEditionAdviceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesEditionAdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -235,4 +235,4 @@ public class RuntimeValuesEditionAdviceConfigurationPackageImpl extends EPackage
createResource(eNS_URI);
}
-} //RuntimeValuesEditionAdviceConfigurationPackageImpl
+} //RuntimevalueseditionadviceconfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java
index 68676a08b3a..f036191d84b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java
@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay;
import org.eclipse.papyrus.views.properties.contexts.View;
@@ -31,14 +31,14 @@ import org.eclipse.papyrus.views.properties.contexts.View;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl#getView <em>View</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
-public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements ViewToDisplay {
+public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
/**
* The cached value of the '{@link #getView() <em>View</em>}' reference.
* <!-- begin-user-doc -->
@@ -65,7 +65,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
*/
@Override
protected EClass eStaticClass() {
- return RuntimeValuesEditionAdviceConfigurationPackage.Literals.VIEW_TO_DISPLAY;
+ return RuntimevalueseditionadviceconfigurationPackage.Literals.VIEW_TO_DISPLAY;
}
/**
@@ -79,7 +79,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
view = (View)eResolveProxy(oldView);
if (view != oldView) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
}
}
return view;
@@ -103,7 +103,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
View oldView = view;
view = newView;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+ eNotify(new ENotificationImpl(this, Notification.SET, RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
}
/**
@@ -114,7 +114,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
if (resolve) return getView();
return basicGetView();
}
@@ -129,7 +129,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
setView((View)newValue);
return;
}
@@ -144,7 +144,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
setView((View)null);
return;
}
@@ -159,7 +159,7 @@ public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements V
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
return view != null;
}
return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
deleted file mode 100644
index 445d381053d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
-
-import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;
-
-/**
- * This is the central singleton for the RuntimeValuesEditionAdviceConfiguration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class RuntimeValuesEditionAdviceConfigurationEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final RuntimeValuesEditionAdviceConfigurationEditPlugin INSTANCE = new RuntimeValuesEditionAdviceConfigurationEditPlugin();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public RuntimeValuesEditionAdviceConfigurationEditPlugin() {
- super
- (new ResourceLocator [] {
- ConstraintsEditPlugin.INSTANCE,
- EcoreEditPlugin.INSTANCE,
- ElementTypesConfigurationsEditPlugin.INSTANCE,
- PropertiesEditPlugin.INSTANCE,
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java
index 6e973b19f94..b90639817d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java
@@ -27,10 +27,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AdviceConfigurationItemProvider;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AdviceBindingConfigurationItemProvider;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration} object.
@@ -38,7 +40,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AdviceConfi
* <!-- end-user-doc -->
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AdviceConfigurationItemProvider {
+public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AdviceBindingConfigurationItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -76,7 +78,7 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AdviceC
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(RuntimeValuesEditionAdviceConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
+ childrenFeatures.add(RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
}
return childrenFeatures;
}
@@ -132,7 +134,7 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AdviceC
updateChildren(notification);
switch (notification.getFeatureID(RuntimeValuesEditionAdviceConfiguration.class)) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -152,8 +154,8 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AdviceC
newChildDescriptors.add
(createChildParameter
- (RuntimeValuesEditionAdviceConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY,
- RuntimeValuesEditionAdviceConfigurationFactory.eINSTANCE.createViewToDisplay()));
+ (RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY,
+ RuntimevalueseditionadviceconfigurationFactory.eINSTANCE.createViewToDisplay()));
}
/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory.java
index 092050ff724..3682f9fd546 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory.java
@@ -14,15 +14,25 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesed
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.edit.command.CommandParameter;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
import org.eclipse.emf.edit.provider.IDisposable;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -31,7 +41,16 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimeValuesEditionAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationAdapterFactory;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
/**
* This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -42,7 +61,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesedi
* <!-- end-user-doc -->
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory extends RuntimeValuesEditionAdviceConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory extends RuntimevalueseditionadviceconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
@@ -73,7 +92,7 @@ public class RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory e
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory() {
+ public RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class);
@@ -230,4 +249,91 @@ public class RuntimeValuesEditionAdviceConfigurationItemProviderAdapterFactory e
if (viewToDisplayItemProvider != null) viewToDisplayItemProvider.dispose();
}
+ /**
+ * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+ /**
+ * The switch for creating child descriptors specific to each extended class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+ /**
+ * The child descriptors being populated.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected List<Object> newChildDescriptors;
+
+ /**
+ * The domain in which to create the children.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EditingDomain editingDomain;
+
+ /**
+ * Creates the a switch for populating child descriptors in the given domain.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+ this.newChildDescriptors = newChildDescriptors;
+ this.editingDomain = editingDomain;
+ }
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
+ newChildDescriptors.add
+ (createChildParameter
+ (ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+ RuntimevalueseditionadviceconfigurationFactory.eINSTANCE.createRuntimeValuesEditionAdviceConfiguration()));
+
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected CommandParameter createChildParameter(Object feature, Object child) {
+ return new CommandParameter(null, feature, child);
+ }
+
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+ ArrayList<Object> result = new ArrayList<Object>();
+ new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+ return result;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ResourceLocator getResourceLocator() {
+ return RuntimeValuesEditionAdviceConfigurationEditPlugin.INSTANCE;
+ }
+ }
+
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java
index d46085efb1c..3b6157fdb08 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java
@@ -30,7 +30,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.ViewToDisplay} object.
@@ -85,7 +87,7 @@ public class ViewToDisplayItemProvider
getResourceLocator(),
getString("_UI_ViewToDisplay_view_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_ViewToDisplay_view_feature", "_UI_ViewToDisplay_type"),
- RuntimeValuesEditionAdviceConfigurationPackage.Literals.VIEW_TO_DISPLAY__VIEW,
+ RuntimevalueseditionadviceconfigurationPackage.Literals.VIEW_TO_DISPLAY__VIEW,
true,
false,
true,
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationXMLProcessor.java
deleted file mode 100644
index a797abdf5f0..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RuntimeValuesEditionAdviceConfigurationXMLProcessor extends XMLProcessor {
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public RuntimeValuesEditionAdviceConfigurationXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- RuntimeValuesEditionAdviceConfigurationPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected Map<String, Resource.Factory> getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //RuntimeValuesEditionAdviceConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationAdapterFactory.java
index e88409a1027..8bc6131bff5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationAdapterFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
@@ -29,17 +30,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesedi
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class RuntimevalueseditionadviceconfigurationAdapterFactory extends AdapterFactoryImpl {
/**
* The cached model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected static RuntimeValuesEditionAdviceConfigurationPackage modelPackage;
+ protected static RuntimevalueseditionadviceconfigurationPackage modelPackage;
/**
* Creates an instance of the adapter factory.
@@ -47,9 +48,9 @@ public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends Adapt
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationAdapterFactory() {
+ public RuntimevalueseditionadviceconfigurationAdapterFactory() {
if (modelPackage == null) {
- modelPackage = RuntimeValuesEditionAdviceConfigurationPackage.eINSTANCE;
+ modelPackage = RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
}
}
@@ -78,8 +79,8 @@ public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends Adapt
* <!-- end-user-doc -->
* @generated
*/
- protected RuntimeValuesEditionAdviceConfigurationSwitch<Adapter> modelSwitch =
- new RuntimeValuesEditionAdviceConfigurationSwitch<Adapter>() {
+ protected RuntimevalueseditionadviceconfigurationSwitch<Adapter> modelSwitch =
+ new RuntimevalueseditionadviceconfigurationSwitch<Adapter>() {
@Override
public Adapter caseRuntimeValuesEditionAdviceConfiguration(RuntimeValuesEditionAdviceConfiguration object) {
return createRuntimeValuesEditionAdviceConfigurationAdapter();
@@ -97,6 +98,10 @@ public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends Adapt
return createAdviceConfigurationAdapter();
}
@Override
+ public Adapter caseAdviceBindingConfiguration(AdviceBindingConfiguration object) {
+ return createAdviceBindingConfigurationAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -173,6 +178,20 @@ public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends Adapt
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration <em>Advice Binding Configuration</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration
+ * @generated
+ */
+ public Adapter createAdviceBindingConfigurationAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
@@ -184,4 +203,4 @@ public class RuntimeValuesEditionAdviceConfigurationAdapterFactory extends Adapt
return null;
}
-} //RuntimeValuesEditionAdviceConfigurationAdapterFactory
+} //RuntimevalueseditionadviceconfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java
index fcb90862888..55f2581136a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java
@@ -22,17 +22,17 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimeValuesEditionAdviceConfigurationResourceImpl
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceImpl
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+public class RuntimevalueseditionadviceconfigurationResourceFactoryImpl extends ResourceFactoryImpl {
/**
* Creates an instance of the resource factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl() {
+ public RuntimevalueseditionadviceconfigurationResourceFactoryImpl() {
super();
}
@@ -44,8 +44,8 @@ public class RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl extends
*/
@Override
public Resource createResource(URI uri) {
- Resource result = new RuntimeValuesEditionAdviceConfigurationResourceImpl(uri);
+ Resource result = new RuntimevalueseditionadviceconfigurationResourceImpl(uri);
return result;
}
-} //RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl
+} //RuntimevalueseditionadviceconfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java
index 170d63fc5c1..4a5447206c5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationResourceImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java
@@ -13,16 +13,17 @@
package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util;
import org.eclipse.emf.common.util.URI;
+
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
/**
* <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimeValuesEditionAdviceConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceFactoryImpl
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationResourceImpl extends XMIResourceImpl {
+public class RuntimevalueseditionadviceconfigurationResourceImpl extends XMIResourceImpl {
/**
* Creates an instance of the resource.
* <!-- begin-user-doc -->
@@ -30,8 +31,8 @@ public class RuntimeValuesEditionAdviceConfigurationResourceImpl extends XMIReso
* @param uri the URI of the new resource.
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationResourceImpl(URI uri) {
+ public RuntimevalueseditionadviceconfigurationResourceImpl(URI uri) {
super(uri);
}
-} //RuntimeValuesEditionAdviceConfigurationResourceImpl
+} //RuntimevalueseditionadviceconfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationSwitch.java
index b9840f3b9d5..12cd724ea31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimeValuesEditionAdviceConfigurationSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationSwitch.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
@@ -32,17 +33,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevaluesedi
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
* @generated
*/
-public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T> {
+public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected static RuntimeValuesEditionAdviceConfigurationPackage modelPackage;
+ protected static RuntimevalueseditionadviceconfigurationPackage modelPackage;
/**
* Creates an instance of the switch.
@@ -50,9 +51,9 @@ public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T>
* <!-- end-user-doc -->
* @generated
*/
- public RuntimeValuesEditionAdviceConfigurationSwitch() {
+ public RuntimevalueseditionadviceconfigurationSwitch() {
if (modelPackage == null) {
- modelPackage = RuntimeValuesEditionAdviceConfigurationPackage.eINSTANCE;
+ modelPackage = RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
}
}
@@ -60,7 +61,7 @@ public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T>
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
@@ -79,15 +80,16 @@ public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T>
@Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
- case RuntimeValuesEditionAdviceConfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: {
+ case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: {
RuntimeValuesEditionAdviceConfiguration runtimeValuesEditionAdviceConfiguration = (RuntimeValuesEditionAdviceConfiguration)theEObject;
T result = caseRuntimeValuesEditionAdviceConfiguration(runtimeValuesEditionAdviceConfiguration);
+ if (result == null) result = caseAdviceBindingConfiguration(runtimeValuesEditionAdviceConfiguration);
if (result == null) result = caseAdviceConfiguration(runtimeValuesEditionAdviceConfiguration);
if (result == null) result = caseConfigurationElement(runtimeValuesEditionAdviceConfiguration);
if (result == null) result = defaultCase(theEObject);
return result;
}
- case RuntimeValuesEditionAdviceConfigurationPackage.VIEW_TO_DISPLAY: {
+ case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY: {
ViewToDisplay viewToDisplay = (ViewToDisplay)theEObject;
T result = caseViewToDisplay(viewToDisplay);
if (result == null) result = defaultCase(theEObject);
@@ -158,6 +160,21 @@ public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T>
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Advice Binding Configuration</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Advice Binding Configuration</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseAdviceBindingConfiguration(AdviceBindingConfiguration object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
@@ -173,4 +190,4 @@ public class RuntimeValuesEditionAdviceConfigurationSwitch<T> extends Switch<T>
return null;
}
-} //RuntimeValuesEditionAdviceConfigurationSwitch
+} //RuntimevalueseditionadviceconfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java
index a5b37908ac8..f5b855e2b2f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java
@@ -12,103 +12,114 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.Activator;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule;
+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+@SuppressWarnings("restriction")
public class InvariantContainerRule extends AbstractInvariantRule<InvariantContainerRuleConfiguration> {
- protected boolean isValid(IElementType typeToAdd, boolean baseIsValid) {
- boolean isValid = baseIsValid;
- for (HierarchyPermission permission : invariantRuleConfiguration.getPermissions()) {
- boolean isPermitted = permission.isIsPermitted();
- String childType = permission.getChildType();
- boolean isStrict = permission.isIsStrict();
- IElementType type = ElementTypeRegistry.getInstance().getType(childType);
- if (type != null) {
- if (isStrict) {
- if (typeToAdd.equals(type)) {
- if (isPermitted) {
- isValid = true;
- }
- } else if (!isPermitted) {
- isValid = false;
- }
- } else {
- // not strict. The super types of typeToCreate should contain the permission type if permitted, or not contain the permission type if not permitted
- List<IElementType> allTypes = Arrays.asList(typeToAdd.getAllSuperTypes());
- allTypes.add(typeToAdd);
- if (allTypes.contains(type)) {
- if (isPermitted) {
- isValid = true;
- }
- } else if (!isPermitted) {
- isValid = false;
- }
- }
- }
- }
- return isValid;
+ protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType typeToCreate, CreateElementRequest request) {
+ EObject newContainer = request.getContainer();
+ return canContain(newContainer);
}
+ protected boolean approveSetRequest(ConfiguredHintedSpecializationElementType typeToMove, SetRequest request) {
+ EObject newContainer = request.getElementToEdit();
+ return canContain(newContainer);
+ }
- protected boolean canContain(SetRequest request) {
-
- List<Object> toEvaluate;
- // multivalue or simple value ?
- if (request.getValue() instanceof List<?>) {
- toEvaluate = (List<Object>) request.getValue();
+ protected boolean approveMoveRequest(ConfiguredHintedSpecializationElementType typeToMove, MoveRequest request) {
+ EObject newContainer = request.getTargetContainer();
+ return canContain(newContainer);
+ }
- } else {
- toEvaluate = new ArrayList<Object>();
- toEvaluate.add(request.getValue());
+ protected boolean canContain(EObject container) {
+ if (container == null) {
+ return false;
}
+ boolean isValid = false;
+ try {
+ IElementType newContainerElementType = ElementTypeRegistry.getInstance().getElementType(container, TypeContext.getContext());
+
+ for (HierarchyPermission permission : invariantRuleConfiguration.getPermissions()) { // for each permission, get the matcher and matches directly
+ boolean isPermitted = permission.isPermitted();
+ String permissionContainerTypeID = permission.getContainerType();
+ boolean isStrict = permission.isStrict();
+ IElementType permissionContainerType = ElementTypeRegistry.getInstance().getType(permissionContainerTypeID);
- for (Object value : toEvaluate) {
- if (value instanceof EObject) {
- IElementType type = ElementTypeRegistry.getInstance().getElementType((EObject) value, request.getClientContext());
- if (type != null) {
- if (!isValid(type, false)) {
- return false;
+ // check is the permission type is a specialization type or a metamodel type, to enhance performances
+ // if this is a metamodel type and strict, a simple equals can match or not if it is permitted or not
+ // if this is a metamodel type and not strict, we only compare the list of supertypes of the eObject type with the permission Type
+ if (permissionContainerType instanceof IMetamodelType) {
+ if (isStrict) {
+ isValid = permissionContainerType.equals(newContainerElementType) ? isPermitted : !isPermitted;
+ } else {
+ // this is not strict
+ // so any super metamodeltype of permission type that matches newContainerElementType is OK
+ isValid = Arrays.asList(newContainerElementType.getAllSuperTypes()).contains(permissionContainerType) ? isPermitted : !isPermitted;
+ }
+ } else if (permissionContainerType instanceof ISpecializationType) {
+ IElementMatcher matcher = ((ISpecializationType) permissionContainerType).getMatcher();
+ if (matcher != null) {
+ boolean matchesSpecialization = matcher.matches(container) && newContainerElementType.equals(((ISpecializationType) permissionContainerType).getMetamodelType()); // the eObject matches the specializations type that is permitted.
+ if (matchesSpecialization) {
+ // test the isStrict now... It will be false if it matches one of the sub-specialization type
+ if (isStrict) {
+ ISpecializationType[] subtypes = ElementTypeRegistry.getInstance().getSpecializationsOf(permissionContainerTypeID);
+ if (subtypes != null && subtypes.length > 0) {
+ for (ISpecializationType subType : subtypes) {
+ isValid = subType.getMatcher().matches(container) ? isPermitted : !isPermitted; // the isStrict is not verified (one of the subtypes is matched whereas it should not)
+ }
+ } else { // there are no further sub specialization types.
+ isValid = isPermitted;
+ }
+ } else {
+ // not strict
+ isValid = isPermitted;
+ }
+ } else { // eObject type does not match the permission type
+ isValid = !isPermitted;
+
+ }
}
- } else {
- return false;
}
}
+
+ } catch (ServiceException e) {
+ Activator.log.error(e);
}
- return true;
+
+ return isValid;
}
+ /**
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)
+ *
+ * @param eObject
+ * @return
+ */
@Override
- public boolean approveRequest(IEditCommandRequest request) {
- if (request instanceof SetRequest) {
- SetRequest setRequest = ((SetRequest) request);
- EStructuralFeature structuralFeature = setRequest.getFeature();
- if (structuralFeature instanceof EReference) {
- EReference reference = ((EReference) structuralFeature);
- if (reference.isContainment() && setRequest.getValue() != null) {
- // check new value
- return canContain(setRequest);
- }
- }
- } else if (request instanceof CreateElementRequest) {
- CreateElementRequest createElementRequest = ((CreateElementRequest) request);
- IElementType typeToCreate = createElementRequest.getElementType();
- return isValid(typeToCreate, false);
- }
- return true;
+ public boolean matches(EObject eObject) {
+ EObject container = eObject.eContainer();
+
+ return canContain(container);
}
+
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
index cd537c887d5..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
index 870d2b208f0..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
index a20a9792220..1e6c63ceb46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
index 045200f3ead..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
index 4d1f9adc072..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif
index 7b7c428c715..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif
index 136e3b27269..1e6c63ceb46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif
index 9250fecbffd..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif
Binary files differ
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
index aa895d943a2..32120467f0a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="invarianttypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"
nsPrefix="invarianttypeconfiguration">
- <eClassifiers xsi:type="ecore:EClass" name="InvariantTypeConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
+ <eClassifiers xsi:type="ecore:EClass" name="InvariantTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
<eStructuralFeatures xsi:type="ecore:EReference" name="invariantRuleConfiguration"
lowerBound="1" eType="#//InvariantRuleConfiguration" containment="true"/>
</eClassifiers>
@@ -12,8 +12,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"
upperBound="-1" eType="#//InvariantRuleConfiguration" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NotInvariantRuleConfiguration" abstract="true"
- eSuperTypes="#//InvariantRuleConfiguration">
+ <eClassifiers xsi:type="ecore:EClass" name="NotInvariantRuleConfiguration" eSuperTypes="#//InvariantRuleConfiguration">
<eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"
eType="#//InvariantRuleConfiguration"/>
</eClassifiers>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel
index 230327630e3..993392db2e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel
@@ -22,8 +22,8 @@
<genClasses image="false" ecoreClass="InvariantTypeConfiguration.ecore#//CompositeInvariantRuleConfiguration">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//CompositeInvariantRuleConfiguration/composedRules"/>
</genClasses>
- <genClasses image="false" ecoreClass="InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration/composedRule"/>
+ <genClasses ecoreClass="InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration">
+ <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration/composedRule"/>
</genClasses>
<genClasses ecoreClass="InvariantTypeConfiguration.ecore#//AndInvariantRuleConfiguration"/>
<genClasses ecoreClass="InvariantTypeConfiguration.ecore#//OrInvariantRuleConfiguration"/>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
index 64e74b9ae55..87a036a99dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
@@ -9,14 +9,6 @@
-
-
-
-
-
-
-
-
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated InvariantTypeConfiguration -->
@@ -59,4 +51,11 @@
factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.InvariantElementTypeFactory">
</elementTypeConfigurationType>
</extension>
+ <extension
+ point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+ <elementTypeSet
+ id="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.elementTypeSet"
+ path="model/invarianttype.elementtypesconfigurations">
+ </elementTypeSet>
+ </extension>
</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java
index caf9007489a..e739db406a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getCompositeInvariantRuleConfiguration()
* @model abstract="true"
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java
index dd51bca3dbf..9abb9cac3dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java
@@ -21,10 +21,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getInvariantTypeConfiguration()
* @model
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java
index 69bc3cd9969..c0d45beff39 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java
@@ -41,6 +41,15 @@ public interface InvariantTypeConfigurationFactory extends EFactory {
InvariantTypeConfiguration createInvariantTypeConfiguration();
/**
+ * Returns a new object of class '<em>Not Invariant Rule Configuration</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Not Invariant Rule Configuration</em>'.
+ * @generated
+ */
+ NotInvariantRuleConfiguration createNotInvariantRuleConfiguration();
+
+ /**
* Returns a new object of class '<em>And Invariant Rule Configuration</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java
index 6ebab4f744c..9edf5db1eb9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java
@@ -20,13 +20,13 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfig
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getNotInvariantRuleConfiguration()
- * @model abstract="true"
+ * @model
* @generated
*/
public interface NotInvariantRuleConfiguration extends InvariantRuleConfiguration {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java
index 2724cb1f0ea..81c1b369b05 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java
@@ -21,8 +21,6 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>And Invariant Rule Configuration</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java
index 598e78561df..89ff5932ff2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java
@@ -34,10 +34,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java
index 62233e4deb7..1ccad7a276e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java
@@ -23,8 +23,6 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Invariant Rule Configuration</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java
index de99ccd2f73..1db3ddcc49b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java
@@ -67,6 +67,7 @@ public class InvariantTypeConfigurationFactoryImpl extends EFactoryImpl implemen
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION: return createInvariantTypeConfiguration();
+ case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION: return createNotInvariantRuleConfiguration();
case InvariantTypeConfigurationPackage.AND_INVARIANT_RULE_CONFIGURATION: return createAndInvariantRuleConfiguration();
case InvariantTypeConfigurationPackage.OR_INVARIANT_RULE_CONFIGURATION: return createOrInvariantRuleConfiguration();
default:
@@ -89,6 +90,16 @@ public class InvariantTypeConfigurationFactoryImpl extends EFactoryImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ public NotInvariantRuleConfiguration createNotInvariantRuleConfiguration() {
+ NotInvariantRuleConfigurationImpl notInvariantRuleConfiguration = new NotInvariantRuleConfigurationImpl();
+ return notInvariantRuleConfiguration;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public AndInvariantRuleConfiguration createAndInvariantRuleConfiguration() {
AndInvariantRuleConfigurationImpl andInvariantRuleConfiguration = new AndInvariantRuleConfigurationImpl();
return andInvariantRuleConfiguration;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java
index d067e1673ea..e2c84e0537d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java
@@ -32,10 +32,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java
index 98ec24615fe..e9217295cd4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java
@@ -315,7 +315,7 @@ public class InvariantTypeConfigurationPackageImpl extends EPackageImpl implemen
initEClass(compositeInvariantRuleConfigurationEClass, CompositeInvariantRuleConfiguration.class, "CompositeInvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getCompositeInvariantRuleConfiguration_ComposedRules(), this.getInvariantRuleConfiguration(), null, "composedRules", null, 2, -1, CompositeInvariantRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(notInvariantRuleConfigurationEClass, NotInvariantRuleConfiguration.class, "NotInvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(notInvariantRuleConfigurationEClass, NotInvariantRuleConfiguration.class, "NotInvariantRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getNotInvariantRuleConfiguration_ComposedRule(), this.getInvariantRuleConfiguration(), null, "composedRule", null, 1, 1, NotInvariantRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(andInvariantRuleConfigurationEClass, AndInvariantRuleConfiguration.class, "AndInvariantRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java
index 04cced57dec..686a074d39f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java
@@ -29,14 +29,14 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl#getComposedRule <em>Composed Rule</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
-public abstract class NotInvariantRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements NotInvariantRuleConfiguration {
+public class NotInvariantRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements NotInvariantRuleConfiguration {
/**
* The cached value of the '{@link #getComposedRule() <em>Composed Rule</em>}' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java
index 19f18e7e5d2..0db6f33e674 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java
@@ -21,8 +21,6 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Or Invariant Rule Configuration</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java
index 9c17812c796..11a47f0f30e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java
@@ -135,6 +135,11 @@ public class CompositeInvariantRuleConfigurationItemProvider extends InvariantRu
newChildDescriptors.add
(createChildParameter
(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,
+ InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,
InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));
newChildDescriptors.add
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java
index 02aed2d9c96..6206716bea6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java
@@ -151,6 +151,11 @@ public class InvariantTypeConfigurationItemProvider extends SpecializationTypeCo
newChildDescriptors.add
(createChildParameter
(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
+ InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));
newChildDescriptors.add
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java
index 3ccbc5a631d..9a09ee82245 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java
@@ -132,6 +132,29 @@ public class InvariantTypeConfigurationItemProviderAdapterFactory extends Invari
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected NotInvariantRuleConfigurationItemProvider notInvariantRuleConfigurationItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createNotInvariantRuleConfigurationAdapter() {
+ if (notInvariantRuleConfigurationItemProvider == null) {
+ notInvariantRuleConfigurationItemProvider = new NotInvariantRuleConfigurationItemProvider(this);
+ }
+
+ return notInvariantRuleConfigurationItemProvider;
+ }
+
+ /**
* This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -304,6 +327,7 @@ public class InvariantTypeConfigurationItemProviderAdapterFactory extends Invari
*/
public void dispose() {
if (invariantTypeConfigurationItemProvider != null) invariantTypeConfigurationItemProvider.dispose();
+ if (notInvariantRuleConfigurationItemProvider != null) notInvariantRuleConfigurationItemProvider.dispose();
if (andInvariantRuleConfigurationItemProvider != null) andInvariantRuleConfigurationItemProvider.dispose();
if (orInvariantRuleConfigurationItemProvider != null) orInvariantRuleConfigurationItemProvider.dispose();
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java
index 8c649d2fdfd..75403891bcf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java
@@ -19,10 +19,14 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration} object.
@@ -73,13 +77,54 @@ public class NotInvariantRuleConfigurationItemProvider extends InvariantRuleConf
InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
true,
false,
- true,
+ false,
null,
null,
null));
}
/**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns NotInvariantRuleConfiguration.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/NotInvariantRuleConfiguration"));
+ }
+
+ /**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -101,6 +146,12 @@ public class NotInvariantRuleConfigurationItemProvider extends InvariantRuleConf
@Override
public void notifyChanged(Notification notification) {
updateChildren(notification);
+
+ switch (notification.getFeatureID(NotInvariantRuleConfiguration.class)) {
+ case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
super.notifyChanged(notification);
}
@@ -114,6 +165,21 @@ public class NotInvariantRuleConfigurationItemProvider extends InvariantRuleConf
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
+ InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
+ InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
+ InvariantTypeConfigurationFactory.eINSTANCE.createOrInvariantRuleConfiguration()));
}
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
index 164fde5f5b3..de52048ffa8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
@@ -61,7 +61,7 @@ public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java
index 7fb0f9b7eac..8b8844c2480 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java
@@ -12,12 +12,89 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
public abstract class AbstractInvariantRule<T extends InvariantRuleConfiguration> implements IInvariantRule<T> {
protected T invariantRuleConfiguration;
@Override
+ public boolean approveRequest(IEditCommandRequest request) {
+ if (request instanceof CreateElementRequest) {
+ IElementType typeToCreate = ((CreateElementRequest) request).getElementType();
+
+ if (!approveCreationRequest(((ConfiguredHintedSpecializationElementType) typeToCreate), (CreateElementRequest) request)) {
+ return false;
+ }
+
+ } else if (request instanceof SetRequest) {
+ EStructuralFeature feature = ((SetRequest) request).getFeature();
+ if (feature instanceof EReference) {
+
+ // containment. Check the kind of element to edit
+ Object value = ((SetRequest) request).getValue();
+ List<Object> values = new ArrayList<Object>();
+ // value = single object or list ?
+ if (value instanceof EObject) {
+ values.add(value);
+ } else if (value instanceof List) {
+ values.addAll((List<Object>) value);
+ }
+
+ for (Object object : values) {
+ if (object instanceof EObject) {
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());
+ for (IElementType type : types) {
+ if (type instanceof ConfiguredHintedSpecializationElementType) {
+ if (!approveSetRequest((ConfiguredHintedSpecializationElementType) type, (SetRequest) request)) {
+ return false;
+ }
+ }
+ }
+ }
+ }
+ }
+ } else if (request instanceof MoveRequest) {
+
+ Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove();
+
+ for (EObject movedElement : objectsToMove.keySet()) {
+
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement, request.getClientContext());
+ for (IElementType type : types) {
+ if (type instanceof ConfiguredHintedSpecializationElementType) {
+ if (!approveMoveRequest((ConfiguredHintedSpecializationElementType) type, (MoveRequest) request)) {
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+ return true;
+ }
+
+
+ abstract protected boolean approveMoveRequest(ConfiguredHintedSpecializationElementType type, MoveRequest request);
+
+ abstract protected boolean approveSetRequest(ConfiguredHintedSpecializationElementType type, SetRequest request);
+
+ abstract protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType type, CreateElementRequest request);
+
+ @Override
public void init(T invariantRuleConfiguration) {
this.invariantRuleConfiguration = invariantRuleConfiguration;
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java
index 7d8ea84aadd..c70d7ff6f00 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java
@@ -12,36 +12,152 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
-
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.Activator;
public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
- InvariantTypeConfiguration configuration;
- public DefaultInvariantEditHelperAdvice(InvariantTypeConfiguration configuration) {
- this.configuration = configuration;
+ @Override
+ public boolean approveRequest(IEditCommandRequest request) {
+ List<ConfiguredHintedSpecializationElementType> types = getInvariantTypes(request);
+
+ // Must approve from the whole hierarchy
+ for (ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType : types) {
+ if (!approveRequest(configuredHintedSpecializationElementType, request)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * @param request
+ *
+ */
+ protected List<ConfiguredHintedSpecializationElementType> getInvariantTypes(IEditCommandRequest request) {
+ List<ConfiguredHintedSpecializationElementType> result = new ArrayList<ConfiguredHintedSpecializationElementType>();
+ if (request instanceof CreateElementRequest) {
+ IElementType typeToCreate = ((CreateElementRequest) request).getElementType();
+ if (typeToCreate instanceof ConfiguredHintedSpecializationElementType) {
+ if (((ConfiguredHintedSpecializationElementType) typeToCreate).getConfiguration() instanceof InvariantTypeConfiguration) {
+ result.add((ConfiguredHintedSpecializationElementType) typeToCreate);
+
+ List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) typeToCreate);
+ result.addAll(superConfiguredTypes);
+ }
+
+ }
+ } else if (request instanceof SetRequest) {
+ // check the feature to set is a containment feature and element to move is an extended element type
+ EStructuralFeature feature = ((SetRequest) request).getFeature();
+ if (feature instanceof EReference) {
+ if (((EReference) feature).isContainment()) {
+
+ // containment. Check the kind of element to edit
+ Object value = ((SetRequest) request).getValue();
+ List<Object> values = new ArrayList<Object>();
+ // value = single object or list ?
+ if (value instanceof EObject) {
+ values.add(value);
+ } else if (value instanceof List) {
+ values.addAll((List<Object>) value);
+ }
+
+ for (Object object : values) {
+ if (object instanceof EObject) {
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());
+ for (IElementType type : types) {
+ if (type instanceof ConfiguredHintedSpecializationElementType) {
+ if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) {
+ result.add((ConfiguredHintedSpecializationElementType) type);
+
+ List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type);
+ result.addAll(superConfiguredTypes);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ } else if (request instanceof MoveRequest) {
+ // check the feature to set is a containment feature and element to move is an extended element type
+ Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove();
+ for (Entry<EObject, EReference> movedElement : objectsToMove.entrySet()) {
+ // do not compute with reference, this can be null. This could be interesting to check...
+ IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement.getKey(), request.getClientContext());
+ for (IElementType type : types) {
+ if (type instanceof ConfiguredHintedSpecializationElementType) {
+ if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) {
+ result.add((ConfiguredHintedSpecializationElementType) type);
+
+ List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type);
+ result.addAll(superConfiguredTypes);
+ }
+ }
+ }
+ }
+ }
+
+ return result;
+
+ }
+
+ protected List<ConfiguredHintedSpecializationElementType> getAllSuperConfiguredTypes(ConfiguredHintedSpecializationElementType type) {
+ IElementType[] superTypes = type.getAllSuperTypes();
+ if (superTypes.length == 0) {
+ return Collections.emptyList();
+ }
+ List<ConfiguredHintedSpecializationElementType> superExtendedTypes = new ArrayList<ConfiguredHintedSpecializationElementType>();
+ // get the reverse order
+ for (int i = superTypes.length - 1; i >= 0; i--) {
+ if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) {
+ if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof InvariantTypeConfiguration) {
+ superExtendedTypes.add((ConfiguredHintedSpecializationElementType) superTypes[i]);
+ }
+ }
+ }
+ return superExtendedTypes;
}
+
protected boolean processCompositeRule(CompositeInvariantRuleConfiguration compositeRule, IEditCommandRequest request) {
Iterator<InvariantRuleConfiguration> iterator = compositeRule.getComposedRules().iterator();
InvariantRuleConfiguration nextComposedRuleConfiguration = iterator.next();
boolean result = processInvariantRule(nextComposedRuleConfiguration, request);
-
+
while (iterator.hasNext()) {
nextComposedRuleConfiguration = iterator.next();
-
+
boolean resultNextComposedRuleConfiguration = processInvariantRule(nextComposedRuleConfiguration, request);
-
+
if (compositeRule instanceof OrInvariantRuleConfiguration) {
if (result == false && resultNextComposedRuleConfiguration) {
result = true;
@@ -52,7 +168,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
}
}
}
-
+
return result;
}
@@ -67,12 +183,20 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
}
}
- @Override
- public boolean approveRequest(IEditCommandRequest request) {
- InvariantRuleConfiguration invariantRuleConfiguration = configuration.getInvariantRuleConfiguration();
+ protected boolean approveRequest(ConfiguredHintedSpecializationElementType elementType, IEditCommandRequest request) {
+
+ ElementTypeConfiguration configuration = ((ConfiguredHintedSpecializationElementType) elementType).getConfiguration();
+ if (configuration instanceof InvariantTypeConfiguration) {
+ InvariantRuleConfiguration invariantRuleConfiguration = ((InvariantTypeConfiguration) configuration).getInvariantRuleConfiguration();
- return processInvariantRule(invariantRuleConfiguration, request);
+ return processInvariantRule(invariantRuleConfiguration, request);
+ } else {
+ Activator.log.warn("Expected InvariantRuleConfiguration as configuration type for : " + elementType);
+ }
+
+ return true;
}
+
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java
new file mode 100644
index 00000000000..ff94e4b6fd8
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;
+
+
+public class DefaultInvariantElementMatcher implements IElementMatcher {
+
+
+ InvariantTypeConfiguration configuration;
+
+ public DefaultInvariantElementMatcher(InvariantTypeConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ /**
+ * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
+ *
+ * @param eObject
+ * @return
+ */
+ @Override
+ public boolean matches(EObject eObject) {
+ InvariantRuleConfiguration invariantRuleConfiguration = configuration.getInvariantRuleConfiguration();
+
+ return processInvariantRule(invariantRuleConfiguration, eObject);
+ }
+
+ /**
+ * @param invariantRuleConfiguration
+ * @param eObject
+ * @return
+ */
+ protected boolean processInvariantRule(InvariantRuleConfiguration invariantRuleConfiguration, EObject eObject) {
+ if (invariantRuleConfiguration instanceof CompositeInvariantRuleConfiguration) {
+ return processCompositeRule((CompositeInvariantRuleConfiguration) invariantRuleConfiguration, eObject);
+ } else if (invariantRuleConfiguration instanceof NotInvariantRuleConfiguration) {
+ InvariantRuleConfiguration composedRule = ((NotInvariantRuleConfiguration) invariantRuleConfiguration).getComposedRule();
+ return !processInvariantRule(composedRule, eObject);
+ } else {
+ return InvariantRuleConfigurationTypeRegistry.getInstance().getInvariantRule(invariantRuleConfiguration).matches(eObject);
+ }
+ }
+
+ /**
+ * @param compositeRule
+ * @param eObject
+ * @return
+ */
+ protected boolean processCompositeRule(CompositeInvariantRuleConfiguration compositeRule, EObject eObject) {
+ Iterator<InvariantRuleConfiguration> iterator = compositeRule.getComposedRules().iterator();
+ InvariantRuleConfiguration nextComposedRuleConfiguration = iterator.next();
+ boolean result = processInvariantRule(nextComposedRuleConfiguration, eObject);
+
+ while (iterator.hasNext()) {
+ nextComposedRuleConfiguration = iterator.next();
+
+ boolean resultNextComposedRuleConfiguration = processInvariantRule(nextComposedRuleConfiguration, eObject);
+
+ if (compositeRule instanceof OrInvariantRuleConfiguration) {
+ if (result == false && resultNextComposedRuleConfiguration) {
+ result = true;
+ }
+ } else if (compositeRule instanceof AndInvariantRuleConfiguration) {
+ if (result == true && !resultNextComposedRuleConfiguration) {
+ result = false;
+ }
+ }
+ }
+
+ return result;
+ }
+
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java
index fb62c7d6a51..c90bb9b2571 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java
@@ -12,13 +12,44 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-public class DefaultInvariantRule extends AbstractInvariantRule<InvariantRuleConfiguration> {
+public class DefaultInvariantRule implements IInvariantRule<InvariantRuleConfiguration> {
+
+
+ /**
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+ *
+ * @param request
+ * @return
+ */
@Override
public boolean approveRequest(IEditCommandRequest request) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#init(org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration)
+ *
+ * @param invariantRuleConfiguration
+ */
+ @Override
+ public void init(InvariantRuleConfiguration invariantRuleConfiguration) {
+
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)
+ *
+ * @param eObject
+ * @return
+ */
+ @Override
+ public boolean matches(EObject eObject) {
return true;
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java
index e95c4e62b80..332cb6abf05 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java
@@ -12,6 +12,7 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
@@ -20,4 +21,5 @@ public interface IInvariantRule<T extends InvariantRuleConfiguration> {
public boolean approveRequest(IEditCommandRequest request);
+ public boolean matches(EObject eObject);
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java
index e901b65e43e..5be9767d285 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java
@@ -12,22 +12,19 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.SpecializationTypeFactory;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
public class InvariantElementTypeFactory extends SpecializationTypeFactory {
-
@Override
- protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration configuration) {
+ protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {
if (configuration instanceof InvariantTypeConfiguration) {
- return new DefaultInvariantEditHelperAdvice((InvariantTypeConfiguration) configuration);
+ return new DefaultInvariantElementMatcher((InvariantTypeConfiguration) configuration);
}
return null;
}
-
-
}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java
index 54cbbecd4b7..34a335ff5c3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java
@@ -21,15 +21,12 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-/**
- * Registry for all matcher factories.
- */
public class InvariantRuleConfigurationTypeRegistry {
/** private singleton instance */
private static InvariantRuleConfigurationTypeRegistry registry;
- /** map configuration type to matcher descriptor */
+ /** map configuration type to invariantRule */
protected Map<String, IInvariantRule<? extends InvariantRuleConfiguration>> invariantRuleConfigurationTypeToInvariantRule = null;
/**

Back to the top