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/nattable
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/nattable')
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations22
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations22
5 files changed, 11 insertions, 59 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 7d13976b58b..d5685a971a8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[2.0.0,3.0.0)
org.eclipse.papyrus.infra.emf.nattable;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
index bc1658629bd..7bba16a0894 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet"
- name="NattableCommon"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="NattableCommon" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 3d900ab09a8..7b6296634c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -63,7 +63,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
index f30cf816786..1e233063ea3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet"
- name="TableContents"
- metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore" name="TableContents" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
index 1d25137fdb8..737b082ab00 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
- xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet"
- name="TableContext"
- metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
- <adviceBindingsConfigurations
- xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
- xmi:id="_jxuLwPvzEeWw0r4E4rSXyw"
- description=""
- identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice"
- inheritance="all"
- editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model" name="TableContext" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file

Back to the top