Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-05-19 16:21:40 +0000
committerGerrit Code Review @ Eclipse.org2016-08-04 11:45:27 +0000
commit1de8a09c355ba2a4ef37f547c9f33692a2e21ebc (patch)
treeb85b7d7c89d384b9fe79688cde3dd1f09479195a /plugins/infra/emf
parent4dff83585552fbbed4fb1433e694a3006fd8cca1 (diff)
downloadorg.eclipse.papyrus-1de8a09c355ba2a4ef37f547c9f33692a2e21ebc.tar.gz
org.eclipse.papyrus-1de8a09c355ba2a4ef37f547c9f33692a2e21ebc.tar.xz
org.eclipse.papyrus-1de8a09c355ba2a4ef37f547c9f33692a2e21ebc.zip
Bug 491783 - Change the ElementTypeConfiguration metamodel to make the
before and after reference directly AdviceConfigurations. Change the interpretation accordingly. Bug 497481 - Change the ElementTypeConfiguration metamodel to replace string-based references to specialization by Ereferences in SpecializationTypeConfiguration. Change the interpretation accordingly. Update oep.infra.types.doc accordingly. Change-Id: I13284a6a74fe3d86427b19424a9b8c4caed01d89
Diffstat (limited to 'plugins/infra/emf')
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations40
4 files changed, 12 insertions, 40 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
index 1452ff83fdc..24cc73c692c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation
-Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
index e5574351b22..2a3be97f39a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.infra.emf.types,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
index ea2d92d93e0..4879ece84f7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.emf.types</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
index daef8b50399..d22382a55a0 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
@@ -1,35 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.elementTypeSet"
- name="Infra-EMF"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <elementTypeConfigurations
- xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
- xmi:id="_H1ejUPvzEeWw0r4E4rSXyw"
- identifier="org.eclipse.papyrus.infra.emf.page"
- name="EObject"
- hint="EObject"
- editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper">
- <eClass
- href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.emf.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="Infra-EMF" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper" hint="EObject" identifier="org.eclipse.papyrus.infra.emf.page" name="EObject" xmi:id="_H1ejUPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
+ <eClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
</elementTypeConfigurations>
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"/>
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice" identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice" inheritance="all" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice" identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file

Back to the top