Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2018-03-20 10:24:46 +0000
committervincent lorenzo2018-03-23 14:04:06 +0000
commit20b61b1805a8fcabb95ca1ce470e8e281e2f867a (patch)
tree2b84250f07ef0f434abedd47cdc84183ef20b87f /plugins/infra
parentb36be92ed00417eeb48f5ed3c77a6d89f1fd2295 (diff)
downloadorg.eclipse.papyrus-20b61b1805a8fcabb95ca1ce470e8e281e2f867a.tar.gz
org.eclipse.papyrus-20b61b1805a8fcabb95ca1ce470e8e281e2f867a.tar.xz
org.eclipse.papyrus-20b61b1805a8fcabb95ca1ce470e8e281e2f867a.zip
Bug 532639: [Table][Matrix] System shall enable to specify the creation location of relationships created using a matrix editor.
Change-Id: I4ffde565f069e65c85c838bd14aebb4b809c61b7 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml2
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/pom.xml2
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/pom.xml2
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF4
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_AxisGroup.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_IdTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdTreeItemAxis.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_EObjectWrapper.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_IdWrapper.gifbin0 -> 223 bytes
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/provider/GenericRelationshipMatrixCellEditorConfigurationItemProvider.java132
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore31
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java85
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java396
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/NattablecelleditorPackage.java117
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java189
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorFactoryImpl.java24
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorPackageImpl.java62
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java55
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java14
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties7
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java123
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml2
65 files changed, 1307 insertions, 64 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
index 6f697d2e1d8..a7b67580b80 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0,
org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-Name: %pluginName
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
index e4c703769af..504395e7676 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.welcome</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
index 21b89721a8b..62b506e187d 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.controlmode;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.papyrus.infra.internationalization.controlmode.Activator
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/pom.xml
index 806958e54e4..6d67dc174d0 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/pom.xml
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.internationalization.controlmode</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
index d551f113d1c..e4cee2b3a52 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.utils;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/pom.xml
index b434746b6aa..89ff58cfe67 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/pom.xml
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.internationalization.utils</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
index 02682464f96..ff3bf186bc6 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.papyrus.infra.internationalization,
org.eclipse.papyrus.infra.internationalization.utils
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml
index 21e576d7b39..5151dd8cccb 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.internationalization</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index 0cba240afd0..e840681007f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -10,14 +10,14 @@ Export-Package: org.eclipse.papyrus.infra.emf.nattable,
org.eclipse.papyrus.infra.emf.nattable.registry,
org.eclipse.papyrus.infra.emf.nattable.selection,
org.eclipse.papyrus.infra.emf.nattable.validator
-Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Name: Papyrus EMF Nattable
Bundle-Activator: org.eclipse.papyrus.infra.emf.nattable.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index 3609eaf91ea..1f13906816c 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
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 01387f51e3d..c7158d8af71 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
@@ -10,12 +10,12 @@ Export-Package: org.eclipse.papyrus.infra.nattable.common,
org.eclipse.papyrus.infra.nattable.common.utils,
org.eclipse.papyrus.infra.nattable.common.wizards,
org.eclipse.papyrus.infra.nattable.internal.common.commands;x-friends:="org.eclipse.papyrus.infra.nattable.gmfdiag"
-Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0)
org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.100.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index ffd820d91ea..242c707ef10 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
- <version>4.100.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index 2d6a110f666..454a3f70749 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
index 05fcc190b6d..37f5449ef5d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
index 4d1016adae1..105a3bc91d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml
index 460649282d0..612685224d7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml
@@ -9,6 +9,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.gmfdiag</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
index 2782b420e82..114693be454 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
@@ -24,7 +24,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.p
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_AxisGroup.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_AxisGroup.gif
new file mode 100644
index 00000000000..361b182bf49
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_AxisGroup.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectAxis.gif
new file mode 100644
index 00000000000..5758968c151
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectTreeItemAxis.gif
new file mode 100644
index 00000000000..2a8a6d1e38b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EObjectTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationAxis.gif
new file mode 100644
index 00000000000..504fdc43840
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationTreeItemAxis.gif
new file mode 100644
index 00000000000..5758968c151
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EOperationTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureAxis.gif
new file mode 100644
index 00000000000..0e0d08d1144
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureTreeItemAxis.gif
new file mode 100644
index 00000000000..63b8ac35c40
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_EStructuralFeatureTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdAxis.gif
new file mode 100644
index 00000000000..72ce2602fc0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdTreeItemAxis.gif
new file mode 100644
index 00000000000..3f02915991f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_FeatureIdTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_IdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_IdTreeItemAxis.gif
new file mode 100644
index 00000000000..12861b659a0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_IdTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdAxis.gif
new file mode 100644
index 00000000000..e76646cad10
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdTreeItemAxis.gif
new file mode 100644
index 00000000000..da4c4c5323e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_ObjectIdTreeItemAxis.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_EObjectWrapper.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_EObjectWrapper.gif
new file mode 100644
index 00000000000..0e0d08d1144
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_EObjectWrapper.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_IdWrapper.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_IdWrapper.gif
new file mode 100644
index 00000000000..b2bf1703890
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateGenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_IdWrapper.gif
Binary files differ
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 424464ea736..49b97f81c27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -257,3 +257,13 @@ _UI_MatrixRelationShipDirection_NONE_literal = NONE
_UI_MatrixRelationShipDirection_FROM_ROW_TO_COLUMN_literal = FROM_ROW_TO_COLUMN
_UI_MatrixRelationShipDirection_FROM_COLUMN_TO_ROW_literal = FROM_COLUMN_TO_ROW
_UI_Table_tableKindId_feature = Table Kind Id
+_UI_GenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerStrategy_feature = Relationship Owner Strategy
+_UI_GenericRelationshipMatrixCellEditorConfiguration_relationshipOwner_feature = Relationship Owner
+_UI_GenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerFeature_feature = Relationship Owner Feature
+_UI_MatrixRelationShipOwnerStrategy_DEFAULT_literal = DEFAULT
+_UI_MatrixRelationShipOwnerStrategy_TABLE_CONTEXT_literal = TABLE_CONTEXT
+_UI_MatrixRelationShipOwnerStrategy_ROW_OWNER_literal = ROW_OWNER
+_UI_MatrixRelationShipOwnerStrategy_ROW_AS_OWNER_literal = ROW_AS_OWNER
+_UI_MatrixRelationShipOwnerStrategy_COLUMN_OWNER_literal = COLUMN_OWNER
+_UI_MatrixRelationShipOwnerStrategy_COLUMN_AS_OWNER_literal = COLUMN_AS_OWNER
+_UI_MatrixRelationShipOwnerStrategy_OTHER_literal = OTHER
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
index af2504aff45..4f55dc5e2f8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.model.edit</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/provider/GenericRelationshipMatrixCellEditorConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/provider/GenericRelationshipMatrixCellEditorConfigurationItemProvider.java
index 29f9e946c6e..e130f2cec70 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/provider/GenericRelationshipMatrixCellEditorConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/provider/GenericRelationshipMatrixCellEditorConfigurationItemProvider.java
@@ -21,16 +21,19 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
/**
@@ -65,6 +68,7 @@ public class GenericRelationshipMatrixCellEditorConfigurationItemProvider extend
addDirectionPropertyDescriptor(object);
addCellContentsFilterPropertyDescriptor(object);
addEditedElementPropertyDescriptor(object);
+ addRelationshipOwnerStrategyPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -158,6 +162,59 @@ public class GenericRelationshipMatrixCellEditorConfigurationItemProvider extend
}
/**
+ * This adds a property descriptor for the Relationship Owner Strategy feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addRelationshipOwnerStrategyPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_GenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerStrategy_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_GenericRelationshipMatrixCellEditorConfiguration_relationshipOwnerStrategy_feature", "_UI_GenericRelationshipMatrixCellEditorConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ 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(NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER);
+ childrenFeatures.add(NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE);
+ }
+ 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 GenericRelationshipMatrixCellEditorConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -197,8 +254,13 @@ public class GenericRelationshipMatrixCellEditorConfigurationItemProvider extend
switch (notification.getFeatureID(GenericRelationshipMatrixCellEditorConfiguration.class)) {
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__CELL_EDITOR_ID:
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__DIRECTION:
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -213,6 +275,76 @@ public class GenericRelationshipMatrixCellEditorConfigurationItemProvider extend
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER,
+ NattablewrapperFactory.eINSTANCE.createEObjectWrapper()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER,
+ NattablewrapperFactory.eINSTANCE.createIdWrapper()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (NattablecelleditorPackage.Literals.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE,
+ NattableaxisFactory.eINSTANCE.createAxisGroup()));
}
/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index 31d76e3f019..30a9af51d32 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
@@ -25,7 +25,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin$Implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
index bafb5d545e4..b6c01aff3af 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.model.editor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
index 43b63c3e99d..114cf288f10 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
index c2f665b907e..621cf1759b7 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
@@ -1006,6 +1006,25 @@
<details key="documentation" value="This field allows to define the kind of element to edit in the cell."/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="relationshipOwnerStrategy"
+ lowerBound="1" eType="#//nattablecelleditor/MatrixRelationShipOwnerStrategy"
+ defaultValueLiteral="DEFAULT">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This field is used to define the owner of relationships created editing the matrix."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="relationshipOwner" eType="#//nattablewrapper/IWrapper"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This field is used only when the relationshipOwnerStrategy is set to Other."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="relationshipOwnerFeature"
+ eType="#//nattableaxis/IAxis" containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This field is used only when the relationshipOwnerStrategy is set to Other.&#xD;&#xA;It will be used, if required, to define the feature in the relationshipOwner which will owns the created relationship"/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="MatrixRelationShipDirection">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1015,6 +1034,18 @@
<eLiterals name="FROM_ROW_TO_COLUMN" value="1" literal="FROM_ROW_TO_COLUMN"/>
<eLiterals name="FROM_COLUMN_TO_ROW" value="2" literal="FROM_COLUMN_TO_ROW"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="MatrixRelationShipOwnerStrategy">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This Enumeration is used to define the owner of relationships created editing the matrix."/>
+ </eAnnotations>
+ <eLiterals name="DEFAULT" literal="DEFAULT"/>
+ <eLiterals name="TABLE_CONTEXT" value="1" literal="TABLE_CONTEXT"/>
+ <eLiterals name="ROW_OWNER" value="2" literal="ROW_OWNER"/>
+ <eLiterals name="ROW_AS_OWNER" value="3" literal="ROW_AS_OWNER"/>
+ <eLiterals name="COLUMN_OWNER" value="4" literal="COLUMN_OWNER"/>
+ <eLiterals name="COLUMN_AS_OWNER" value="5" literal="COLUMN_AS_OWNER"/>
+ <eLiterals name="OTHER" value="6" literal="OTHER"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IMatrixCellEditorConfiguration" abstract="true"
interface="true" eSuperTypes="#//nattablecelleditor/ICellEditorConfiguration">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
index c3b9225ca09..08b5417c6a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.model</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
index 8fc1ea67c78..14ce4057e2e 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
@@ -14,6 +14,8 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor;
import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
/**
@@ -32,6 +34,9 @@ import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getDirection <em>Direction</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getCellContentsFilter <em>Cell Contents Filter</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getEditedElement <em>Edited Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerStrategy <em>Relationship Owner Strategy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwner <em>Relationship Owner</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerFeature <em>Relationship Owner Feature</em>}</li>
* </ul>
*
* @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration()
@@ -119,4 +124,84 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
*/
void setEditedElement(ElementTypeConfiguration value);
+ /**
+ * Returns the value of the '<em><b>Relationship Owner Strategy</b></em>' attribute.
+ * The default value is <code>"DEFAULT"</code>.
+ * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This field is used to define the owner of relationships created editing the matrix.
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Relationship Owner Strategy</em>' attribute.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
+ * @see #setRelationshipOwnerStrategy(MatrixRelationShipOwnerStrategy)
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy()
+ * @model default="DEFAULT" required="true"
+ * @generated
+ */
+ MatrixRelationShipOwnerStrategy getRelationshipOwnerStrategy();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerStrategy <em>Relationship Owner Strategy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Relationship Owner Strategy</em>' attribute.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
+ * @see #getRelationshipOwnerStrategy()
+ * @generated
+ */
+ void setRelationshipOwnerStrategy(MatrixRelationShipOwnerStrategy value);
+
+ /**
+ * Returns the value of the '<em><b>Relationship Owner</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This field is used only when the relationshipOwnerStrategy is set to Other.
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Relationship Owner</em>' containment reference.
+ * @see #setRelationshipOwner(IWrapper)
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner()
+ * @model containment="true"
+ * @generated
+ */
+ IWrapper getRelationshipOwner();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwner <em>Relationship Owner</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Relationship Owner</em>' containment reference.
+ * @see #getRelationshipOwner()
+ * @generated
+ */
+ void setRelationshipOwner(IWrapper value);
+
+ /**
+ * Returns the value of the '<em><b>Relationship Owner Feature</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This field is used only when the relationshipOwnerStrategy is set to Other.
+ * It will be used, if required, to define the feature in the relationshipOwner which will owns the created relationship
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Relationship Owner Feature</em>' containment reference.
+ * @see #setRelationshipOwnerFeature(IAxis)
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature()
+ * @model containment="true"
+ * @generated
+ */
+ IAxis getRelationshipOwnerFeature();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerFeature <em>Relationship Owner Feature</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Relationship Owner Feature</em>' containment reference.
+ * @see #getRelationshipOwnerFeature()
+ * @generated
+ */
+ void setRelationshipOwnerFeature(IAxis value);
+
} // GenericRelationshipMatrixCellEditorConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java
new file mode 100644
index 00000000000..0e9dabd6047
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java
@@ -0,0 +1,396 @@
+/**
+ * Copyright (c) 2013 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:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Matrix Relation Ship Owner Strategy</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This Enumeration is used to define the owner of relationships created editing the matrix.
+ * <!-- end-model-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getMatrixRelationShipOwnerStrategy()
+ * @model
+ * @generated
+ */
+public enum MatrixRelationShipOwnerStrategy implements Enumerator {
+ /**
+ * The '<em><b>DEFAULT</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #DEFAULT_VALUE
+ * @generated
+ * @ordered
+ */
+ DEFAULT(0, "DEFAULT", "DEFAULT"), //$NON-NLS-1$ //$NON-NLS-2$
+ /**
+ * The '<em><b>TABLE CONTEXT</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #TABLE_CONTEXT_VALUE
+ * @generated
+ * @ordered
+ */
+ TABLE_CONTEXT(1, "TABLE_CONTEXT", "TABLE_CONTEXT"), //$NON-NLS-1$ //$NON-NLS-2$
+ /**
+ * The '<em><b>ROW OWNER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #ROW_OWNER_VALUE
+ * @generated
+ * @ordered
+ */
+ ROW_OWNER(2, "ROW_OWNER", "ROW_OWNER"), //$NON-NLS-1$ //$NON-NLS-2$
+
+ /**
+ * The '<em><b>ROW AS OWNER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #ROW_AS_OWNER_VALUE
+ * @generated
+ * @ordered
+ */
+ ROW_AS_OWNER(3, "ROW_AS_OWNER", "ROW_AS_OWNER"), //$NON-NLS-1$ //$NON-NLS-2$
+ /**
+ * The '<em><b>COLUMN OWNER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #COLUMN_OWNER_VALUE
+ * @generated
+ * @ordered
+ */
+ COLUMN_OWNER(4, "COLUMN_OWNER", "COLUMN_OWNER"), //$NON-NLS-1$ //$NON-NLS-2$
+
+ /**
+ * The '<em><b>COLUMN AS OWNER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #COLUMN_AS_OWNER_VALUE
+ * @generated
+ * @ordered
+ */
+ COLUMN_AS_OWNER(5, "COLUMN_AS_OWNER", "COLUMN_AS_OWNER"), //$NON-NLS-1$ //$NON-NLS-2$
+
+ /**
+ * The '<em><b>OTHER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #OTHER_VALUE
+ * @generated
+ * @ordered
+ */
+ OTHER(6, "OTHER", "OTHER"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ /**
+ * The '<em><b>DEFAULT</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>DEFAULT</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #DEFAULT
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int DEFAULT_VALUE = 0;
+
+ /**
+ * The '<em><b>TABLE CONTEXT</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>TABLE CONTEXT</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #TABLE_CONTEXT
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int TABLE_CONTEXT_VALUE = 1;
+
+ /**
+ * The '<em><b>ROW OWNER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>ROW OWNER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #ROW_OWNER
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int ROW_OWNER_VALUE = 2;
+
+ /**
+ * The '<em><b>ROW AS OWNER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>ROW AS OWNER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #ROW_AS_OWNER
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int ROW_AS_OWNER_VALUE = 3;
+
+ /**
+ * The '<em><b>COLUMN OWNER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>COLUMN OWNER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #COLUMN_OWNER
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int COLUMN_OWNER_VALUE = 4;
+
+ /**
+ * The '<em><b>COLUMN AS OWNER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>COLUMN AS OWNER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #COLUMN_AS_OWNER
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int COLUMN_AS_OWNER_VALUE = 5;
+
+ /**
+ * The '<em><b>OTHER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @see #OTHER
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int OTHER_VALUE = 6;
+
+ /**
+ * An array of all the '<em><b>Matrix Relation Ship Owner Strategy</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private static final MatrixRelationShipOwnerStrategy[] VALUES_ARRAY = new MatrixRelationShipOwnerStrategy[] {
+ DEFAULT,
+ TABLE_CONTEXT,
+ ROW_OWNER,
+ ROW_AS_OWNER,
+ COLUMN_OWNER,
+ COLUMN_AS_OWNER,
+ OTHER,
+ };
+
+ /**
+ * A public read-only list of all the '<em><b>Matrix Relation Ship Owner Strategy</b></em>' enumerators.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final List<MatrixRelationShipOwnerStrategy> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the '<em><b>Matrix Relation Ship Owner Strategy</b></em>' literal with the specified literal value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param literal
+ * the literal.
+ * @return the matching enumerator or <code>null</code>.
+ * @generated
+ */
+ public static MatrixRelationShipOwnerStrategy get(String literal) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ MatrixRelationShipOwnerStrategy result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Matrix Relation Ship Owner Strategy</b></em>' literal with the specified name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param name
+ * the name.
+ * @return the matching enumerator or <code>null</code>.
+ * @generated
+ */
+ public static MatrixRelationShipOwnerStrategy getByName(String name) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ MatrixRelationShipOwnerStrategy result = VALUES_ARRAY[i];
+ if (result.getName().equals(name)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>Matrix Relation Ship Owner Strategy</b></em>' literal with the specified integer value.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the integer value.
+ * @return the matching enumerator or <code>null</code>.
+ * @generated
+ */
+ public static MatrixRelationShipOwnerStrategy get(int value) {
+ switch (value) {
+ case DEFAULT_VALUE:
+ return DEFAULT;
+ case TABLE_CONTEXT_VALUE:
+ return TABLE_CONTEXT;
+ case ROW_OWNER_VALUE:
+ return ROW_OWNER;
+ case ROW_AS_OWNER_VALUE:
+ return ROW_AS_OWNER;
+ case COLUMN_OWNER_VALUE:
+ return COLUMN_OWNER;
+ case COLUMN_AS_OWNER_VALUE:
+ return COLUMN_AS_OWNER;
+ case OTHER_VALUE:
+ return OTHER;
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final int value;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String name;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private MatrixRelationShipOwnerStrategy(int value, String name, String literal) {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getLiteral() {
+ return literal;
+ }
+
+ /**
+ * Returns the literal value of the enumerator, which is its string representation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return literal;
+ }
+
+} // MatrixRelationShipOwnerStrategy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/NattablecelleditorPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/NattablecelleditorPackage.java
index 9b8c4b40dbd..917159747b5 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/NattablecelleditorPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/NattablecelleditorPackage.java
@@ -316,13 +316,40 @@ public interface NattablecelleditorPackage extends EPackage {
int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 2;
/**
+ * The feature id for the '<em><b>Relationship Owner Strategy</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Relationship Owner</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Relationship Owner Feature</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 5;
+
+ /**
* The number of structural features of the '<em>Generic Relationship Matrix Cell Editor Configuration</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 3;
+ int GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT = IMATRIX_CELL_EDITOR_CONFIGURATION_FEATURE_COUNT + 6;
/**
* The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -381,6 +408,17 @@ public interface NattablecelleditorPackage extends EPackage {
/**
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy <em>Matrix Relation Ship Owner Strategy</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl#getMatrixRelationShipOwnerStrategy()
+ * @generated
+ */
+ int MATRIX_RELATION_SHIP_OWNER_STRATEGY = 4;
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration <em>ICell Editor Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -445,6 +483,39 @@ public interface NattablecelleditorPackage extends EPackage {
EReference getGenericRelationshipMatrixCellEditorConfiguration_EditedElement();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerStrategy <em>Relationship Owner Strategy</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Relationship Owner Strategy</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerStrategy()
+ * @see #getGenericRelationshipMatrixCellEditorConfiguration()
+ * @generated
+ */
+ EAttribute getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy();
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwner <em>Relationship Owner</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Relationship Owner</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwner()
+ * @see #getGenericRelationshipMatrixCellEditorConfiguration()
+ * @generated
+ */
+ EReference getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner();
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerFeature <em>Relationship Owner Feature</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Relationship Owner Feature</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration#getRelationshipOwnerFeature()
+ * @see #getGenericRelationshipMatrixCellEditorConfiguration()
+ * @generated
+ */
+ EReference getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.IMatrixCellEditorConfiguration <em>IMatrix Cell Editor Configuration</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -465,6 +536,16 @@ public interface NattablecelleditorPackage extends EPackage {
EEnum getMatrixRelationShipDirection();
/**
+ * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy <em>Matrix Relation Ship Owner Strategy</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for enum '<em>Matrix Relation Ship Owner Strategy</em>'.
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
+ * @generated
+ */
+ EEnum getMatrixRelationShipOwnerStrategy();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -540,6 +621,30 @@ public interface NattablecelleditorPackage extends EPackage {
EReference GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT = eINSTANCE.getGenericRelationshipMatrixCellEditorConfiguration_EditedElement();
/**
+ * The meta object literal for the '<em><b>Relationship Owner Strategy</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY = eINSTANCE.getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy();
+
+ /**
+ * The meta object literal for the '<em><b>Relationship Owner</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER = eINSTANCE.getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner();
+
+ /**
+ * The meta object literal for the '<em><b>Relationship Owner Feature</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE = eINSTANCE.getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature();
+
+ /**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.IMatrixCellEditorConfiguration <em>IMatrix Cell Editor Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -559,6 +664,16 @@ public interface NattablecelleditorPackage extends EPackage {
*/
EEnum MATRIX_RELATION_SHIP_DIRECTION = eINSTANCE.getMatrixRelationShipDirection();
+ /**
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy <em>Matrix Relation Ship Owner Strategy</em>}' enum.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl#getMatrixRelationShipOwnerStrategy()
+ * @generated
+ */
+ EEnum MATRIX_RELATION_SHIP_OWNER_STRATEGY = eINSTANCE.getMatrixRelationShipOwnerStrategy();
+
}
} //NattablecelleditorPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
index 304e7555e29..37fead0c62d 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
@@ -22,12 +22,15 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.GenericRelationshipMatrixCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipDirection;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
/**
@@ -42,6 +45,9 @@ import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getDirection <em>Direction</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getCellContentsFilter <em>Cell Contents Filter</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getEditedElement <em>Edited Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getRelationshipOwnerStrategy <em>Relationship Owner Strategy</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getRelationshipOwner <em>Relationship Owner</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.GenericRelationshipMatrixCellEditorConfigurationImpl#getRelationshipOwnerFeature <em>Relationship Owner Feature</em>}</li>
* </ul>
*
* @generated
@@ -108,6 +114,46 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
protected ElementTypeConfiguration editedElement;
/**
+ * The default value of the '{@link #getRelationshipOwnerStrategy() <em>Relationship Owner Strategy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRelationshipOwnerStrategy()
+ * @generated
+ * @ordered
+ */
+ protected static final MatrixRelationShipOwnerStrategy RELATIONSHIP_OWNER_STRATEGY_EDEFAULT = MatrixRelationShipOwnerStrategy.DEFAULT;
+
+ /**
+ * The cached value of the '{@link #getRelationshipOwnerStrategy() <em>Relationship Owner Strategy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRelationshipOwnerStrategy()
+ * @generated
+ * @ordered
+ */
+ protected MatrixRelationShipOwnerStrategy relationshipOwnerStrategy = RELATIONSHIP_OWNER_STRATEGY_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getRelationshipOwner() <em>Relationship Owner</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRelationshipOwner()
+ * @generated
+ * @ordered
+ */
+ protected IWrapper relationshipOwner;
+
+ /**
+ * The cached value of the '{@link #getRelationshipOwnerFeature() <em>Relationship Owner Feature</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRelationshipOwnerFeature()
+ * @generated
+ * @ordered
+ */
+ protected IAxis relationshipOwnerFeature;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -254,11 +300,122 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
* <!-- end-user-doc -->
* @generated
*/
+ public MatrixRelationShipOwnerStrategy getRelationshipOwnerStrategy() {
+ return relationshipOwnerStrategy;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRelationshipOwnerStrategy(MatrixRelationShipOwnerStrategy newRelationshipOwnerStrategy) {
+ MatrixRelationShipOwnerStrategy oldRelationshipOwnerStrategy = relationshipOwnerStrategy;
+ relationshipOwnerStrategy = newRelationshipOwnerStrategy == null ? RELATIONSHIP_OWNER_STRATEGY_EDEFAULT : newRelationshipOwnerStrategy;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY, oldRelationshipOwnerStrategy, relationshipOwnerStrategy));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IWrapper getRelationshipOwner() {
+ return relationshipOwner;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetRelationshipOwner(IWrapper newRelationshipOwner, NotificationChain msgs) {
+ IWrapper oldRelationshipOwner = relationshipOwner;
+ relationshipOwner = newRelationshipOwner;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER, oldRelationshipOwner, newRelationshipOwner);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRelationshipOwner(IWrapper newRelationshipOwner) {
+ if (newRelationshipOwner != relationshipOwner) {
+ NotificationChain msgs = null;
+ if (relationshipOwner != null)
+ msgs = ((InternalEObject)relationshipOwner).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER, null, msgs);
+ if (newRelationshipOwner != null)
+ msgs = ((InternalEObject)newRelationshipOwner).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER, null, msgs);
+ msgs = basicSetRelationshipOwner(newRelationshipOwner, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER, newRelationshipOwner, newRelationshipOwner));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IAxis getRelationshipOwnerFeature() {
+ return relationshipOwnerFeature;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetRelationshipOwnerFeature(IAxis newRelationshipOwnerFeature, NotificationChain msgs) {
+ IAxis oldRelationshipOwnerFeature = relationshipOwnerFeature;
+ relationshipOwnerFeature = newRelationshipOwnerFeature;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE, oldRelationshipOwnerFeature, newRelationshipOwnerFeature);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRelationshipOwnerFeature(IAxis newRelationshipOwnerFeature) {
+ if (newRelationshipOwnerFeature != relationshipOwnerFeature) {
+ NotificationChain msgs = null;
+ if (relationshipOwnerFeature != null)
+ msgs = ((InternalEObject)relationshipOwnerFeature).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE, null, msgs);
+ if (newRelationshipOwnerFeature != null)
+ msgs = ((InternalEObject)newRelationshipOwnerFeature).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE, null, msgs);
+ msgs = basicSetRelationshipOwnerFeature(newRelationshipOwnerFeature, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE, newRelationshipOwnerFeature, newRelationshipOwnerFeature));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__CELL_CONTENTS_FILTER:
return basicSetCellContentsFilter(null, msgs);
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ return basicSetRelationshipOwner(null, msgs);
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ return basicSetRelationshipOwnerFeature(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -280,6 +437,12 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT:
if (resolve) return getEditedElement();
return basicGetEditedElement();
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY:
+ return getRelationshipOwnerStrategy();
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ return getRelationshipOwner();
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ return getRelationshipOwnerFeature();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -304,6 +467,15 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT:
setEditedElement((ElementTypeConfiguration)newValue);
return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY:
+ setRelationshipOwnerStrategy((MatrixRelationShipOwnerStrategy)newValue);
+ return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ setRelationshipOwner((IWrapper)newValue);
+ return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ setRelationshipOwnerFeature((IAxis)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -328,6 +500,15 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT:
setEditedElement((ElementTypeConfiguration)null);
return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY:
+ setRelationshipOwnerStrategy(RELATIONSHIP_OWNER_STRATEGY_EDEFAULT);
+ return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ setRelationshipOwner((IWrapper)null);
+ return;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ setRelationshipOwnerFeature((IAxis)null);
+ return;
}
super.eUnset(featureID);
}
@@ -348,6 +529,12 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
return cellContentsFilter != null;
case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT:
return editedElement != null;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY:
+ return relationshipOwnerStrategy != RELATIONSHIP_OWNER_STRATEGY_EDEFAULT;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER:
+ return relationshipOwner != null;
+ case NattablecelleditorPackage.GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE:
+ return relationshipOwnerFeature != null;
}
return super.eIsSet(featureID);
}
@@ -366,6 +553,8 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
result.append(cellEditorId);
result.append(", direction: "); //$NON-NLS-1$
result.append(direction);
+ result.append(", relationshipOwnerStrategy: "); //$NON-NLS-1$
+ result.append(relationshipOwnerStrategy);
result.append(')');
return result.toString();
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorFactoryImpl.java
index 7164ddd8efe..e805528f080 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorFactoryImpl.java
@@ -83,6 +83,8 @@ public class NattablecelleditorFactoryImpl extends EFactoryImpl implements Natta
switch (eDataType.getClassifierID()) {
case NattablecelleditorPackage.MATRIX_RELATION_SHIP_DIRECTION:
return createMatrixRelationShipDirectionFromString(eDataType, initialValue);
+ case NattablecelleditorPackage.MATRIX_RELATION_SHIP_OWNER_STRATEGY:
+ return createMatrixRelationShipOwnerStrategyFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -98,6 +100,8 @@ public class NattablecelleditorFactoryImpl extends EFactoryImpl implements Natta
switch (eDataType.getClassifierID()) {
case NattablecelleditorPackage.MATRIX_RELATION_SHIP_DIRECTION:
return convertMatrixRelationShipDirectionToString(eDataType, instanceValue);
+ case NattablecelleditorPackage.MATRIX_RELATION_SHIP_OWNER_STRATEGY:
+ return convertMatrixRelationShipOwnerStrategyToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -138,6 +142,26 @@ public class NattablecelleditorFactoryImpl extends EFactoryImpl implements Natta
* <!-- end-user-doc -->
* @generated
*/
+ public MatrixRelationShipOwnerStrategy createMatrixRelationShipOwnerStrategyFromString(EDataType eDataType, String initialValue) {
+ MatrixRelationShipOwnerStrategy result = MatrixRelationShipOwnerStrategy.get(initialValue);
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return result;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertMatrixRelationShipOwnerStrategyToString(EDataType eDataType, Object instanceValue) {
+ return instanceValue == null ? null : instanceValue.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public NattablecelleditorPackage getNattablecelleditorPackage() {
return (NattablecelleditorPackage)getEPackage();
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorPackageImpl.java
index d02180ba641..ab83b98f19a 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/NattablecelleditorPackageImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.Gene
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.IMatrixCellEditorConfiguration;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipDirection;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorFactory;
import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
@@ -114,6 +115,13 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
private EEnum matrixRelationShipDirectionEEnum = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EEnum matrixRelationShipOwnerStrategyEEnum = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -273,6 +281,33 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy() {
+ return (EAttribute)genericRelationshipMatrixCellEditorConfigurationEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner() {
+ return (EReference)genericRelationshipMatrixCellEditorConfigurationEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature() {
+ return (EReference)genericRelationshipMatrixCellEditorConfigurationEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getIMatrixCellEditorConfiguration() {
return iMatrixCellEditorConfigurationEClass;
}
@@ -291,6 +326,15 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
* <!-- end-user-doc -->
* @generated
*/
+ public EEnum getMatrixRelationShipOwnerStrategy() {
+ return matrixRelationShipOwnerStrategyEEnum;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public NattablecelleditorFactory getNattablecelleditorFactory() {
return (NattablecelleditorFactory)getEFactoryInstance();
}
@@ -321,11 +365,15 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
createEAttribute(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__DIRECTION);
createEReference(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__CELL_CONTENTS_FILTER);
createEReference(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__EDITED_ELEMENT);
+ createEAttribute(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_STRATEGY);
+ createEReference(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER);
+ createEReference(genericRelationshipMatrixCellEditorConfigurationEClass, GENERIC_RELATIONSHIP_MATRIX_CELL_EDITOR_CONFIGURATION__RELATIONSHIP_OWNER_FEATURE);
iMatrixCellEditorConfigurationEClass = createEClass(IMATRIX_CELL_EDITOR_CONFIGURATION);
// Create enums
matrixRelationShipDirectionEEnum = createEEnum(MATRIX_RELATION_SHIP_DIRECTION);
+ matrixRelationShipOwnerStrategyEEnum = createEEnum(MATRIX_RELATION_SHIP_OWNER_STRATEGY);
}
/**
@@ -355,6 +403,8 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
BooleanExpressionsPackage theBooleanExpressionsPackage = (BooleanExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(BooleanExpressionsPackage.eNS_URI);
ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
+ NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);
+ NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
// Create type parameters
@@ -373,6 +423,9 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
initEAttribute(getGenericRelationshipMatrixCellEditorConfiguration_Direction(), this.getMatrixRelationShipDirection(), "direction", "FROM_ROW_TO_COLUMN", 0, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
initEReference(getGenericRelationshipMatrixCellEditorConfiguration_CellContentsFilter(), theBooleanExpressionsPackage.getIBooleanEObjectExpression(), null, "cellContentsFilter", null, 0, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getGenericRelationshipMatrixCellEditorConfiguration_EditedElement(), theElementTypesConfigurationsPackage.getElementTypeConfiguration(), null, "editedElement", null, 0, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy(), this.getMatrixRelationShipOwnerStrategy(), "relationshipOwnerStrategy", "DEFAULT", 1, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEReference(getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner(), theNattablewrapperPackage.getIWrapper(), null, "relationshipOwner", null, 0, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature(), theNattableaxisPackage.getIAxis(), null, "relationshipOwnerFeature", null, 0, 1, GenericRelationshipMatrixCellEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(iMatrixCellEditorConfigurationEClass, IMatrixCellEditorConfiguration.class, "IMatrixCellEditorConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -381,6 +434,15 @@ public class NattablecelleditorPackageImpl extends EPackageImpl implements Natta
addEEnumLiteral(matrixRelationShipDirectionEEnum, MatrixRelationShipDirection.NONE);
addEEnumLiteral(matrixRelationShipDirectionEEnum, MatrixRelationShipDirection.FROM_ROW_TO_COLUMN);
addEEnumLiteral(matrixRelationShipDirectionEEnum, MatrixRelationShipDirection.FROM_COLUMN_TO_ROW);
+
+ initEEnum(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.class, "MatrixRelationShipOwnerStrategy"); //$NON-NLS-1$
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.DEFAULT);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.TABLE_CONTEXT);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.ROW_OWNER);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.ROW_AS_OWNER);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.COLUMN_OWNER);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.COLUMN_AS_OWNER);
+ addEEnumLiteral(matrixRelationShipOwnerStrategyEEnum, MatrixRelationShipOwnerStrategy.OTHER);
}
} //NattablecelleditorPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index fa6e502d1f5..07d83fe7dd0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Name: %Bundle-Name
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,
org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index 3b06a8d1009..74241e44502 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index fe2e1974d47..29a680f2517 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -6,14 +6,14 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4
org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0)"
+ org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.properties.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 2e58eb8a66f..0a92136d67b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
index 77572ceb0e9..ffcf5b6bc1c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation
Bundle-Vendor: %providerName
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.papyrus.infra.types;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.nattable.model;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
index 973ffa17d99..e27e029afca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.representation.edit</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
index fd3bbc675f2..2ce64d778c3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
index 888c774a38a..869890f5a06 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.representation</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index 5c1f9a32c36..9b88376c948 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Export-Package: org.eclipse.papyrus.infra.nattable.views.config,
org.eclipse.papyrus.infra.nattable.views.config.provider,
org.eclipse.papyrus.infra.nattable.views.config.utils
Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
index ee7a09df5c4..f557ce80ddb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
index 15408d8984d..3ffbbcb2e30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.editor;singleton:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
index 615c7572ba5..83c7f11c228 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.views.editor</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 55d051355c0..6d4238ab17a 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
@@ -55,7 +55,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable,
Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
@@ -71,7 +71,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
index b05017a558e..248d95cb20b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java
new file mode 100644
index 00000000000..9998ebd6476
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Copyright (c) 2018 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:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.contentprovider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ *
+ * This class provides the available relationship direction required to edit relationship in case of matrix table
+ *
+ */
+public class MatrixRelationshipOwnerStrategyContentProvider implements IStaticContentProvider {
+
+ /**
+ * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+ *
+ * @param inputElement
+ * @return
+ */
+ @Override
+ public Object[] getElements(Object inputElement) {
+ return getElements();
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
+ *
+ * @return
+ */
+ @Override
+ public Object[] getElements() {
+ final List<Object> values = new ArrayList<Object>();
+ for (EEnumLiteral lit : NattablecelleditorPackage.eINSTANCE.getMatrixRelationShipOwnerStrategy().getELiterals()) {
+ values.add(lit.getInstance());
+ }
+ return values.toArray();
+ }
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
index deb94c6a88e..eaa2d9ea929 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
@@ -497,6 +497,20 @@ public class Messages extends NLS {
public static String MatrixRelationshipDirectionLabelProvider_ColumnToRow;
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_ColumAsOwner;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_ColumnsOwnerAsOwner;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_Default;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_Other;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_RowAsOwner;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_RowsOwnerAsOwner;
+
+ public static String MatrixRelationshipOwnerStrategyLabelProvider_TableRootElement;
+
/**
* @since 4.0
*/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
index d3ac8c7f475..7456b67c4a1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
@@ -217,5 +217,12 @@ ExportTableDialog_OverrideConfirmMessasgeDialogText=Override confirmation
MatrixRelationshipDirectionLabelProvider_None=None
MatrixRelationshipDirectionLabelProvider_RowToColumn=From Row To Column
MatrixRelationshipDirectionLabelProvider_ColumnToRow=From Column To Row
+MatrixRelationshipOwnerStrategyLabelProvider_ColumAsOwner=Column as Owner
+MatrixRelationshipOwnerStrategyLabelProvider_ColumnsOwnerAsOwner=Column's Owner As Owner
+MatrixRelationshipOwnerStrategyLabelProvider_Default=Default
+MatrixRelationshipOwnerStrategyLabelProvider_Other=Other
+MatrixRelationshipOwnerStrategyLabelProvider_RowAsOwner=Row As Owner
+MatrixRelationshipOwnerStrategyLabelProvider_RowsOwnerAsOwner=Row's Owner As Owner
+MatrixRelationshipOwnerStrategyLabelProvider_TableRootElement=Table Root Element
CellPreferenceInitializer_NotAvailable=N/A
CellPreferencePage_UnsupportedColumnCellLabel=Define content of cell when its feature column is not supported \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java
new file mode 100644
index 00000000000..1cee9192244
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2018 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:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.provider;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * The label provider to use for the enumeration used to define the relationship direction
+ *
+ */
+public class MatrixRelationshipOwnerStrategyLabelProvider implements ILabelProvider {
+
+ /**
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+ *
+ * @param listener
+ */
+ @Override
+ public void addListener(ILabelProviderListener listener) {
+
+ }
+
+ /**
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+ *
+ */
+ @Override
+ public void dispose() {
+
+ }
+
+ /**
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+ *
+ * @param element
+ * @param property
+ * @return
+ */
+ @Override
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+
+ /**
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+ *
+ * @param listener
+ */
+ @Override
+ public void removeListener(ILabelProviderListener listener) {
+
+ }
+
+ /**
+ * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+ *
+ * @param element
+ * @return
+ */
+ @Override
+ public Image getImage(Object element) {
+ return null;
+ }
+
+ /**
+ * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+ *
+ * @param direction
+ * @return
+ */
+ @Override
+ public String getText(Object direction) {
+ MatrixRelationShipOwnerStrategy instance = null;
+ if (direction instanceof MatrixRelationShipOwnerStrategy) {
+ instance = (MatrixRelationShipOwnerStrategy) direction;
+ }
+ String label = ""; //$NON-NLS-1$
+ if (null != instance) {
+ switch (instance.getValue()) {
+ case MatrixRelationShipOwnerStrategy.DEFAULT_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_Default;
+ break;
+ case MatrixRelationShipOwnerStrategy.ROW_AS_OWNER_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_RowAsOwner;
+ break;
+ case MatrixRelationShipOwnerStrategy.ROW_OWNER_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_RowsOwnerAsOwner;
+ break;
+ case MatrixRelationShipOwnerStrategy.COLUMN_AS_OWNER_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_ColumAsOwner;
+ break;
+ case MatrixRelationShipOwnerStrategy.COLUMN_OWNER_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_ColumnsOwnerAsOwner;
+ break;
+ case MatrixRelationShipOwnerStrategy.TABLE_CONTEXT_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_TableRootElement;
+ break;
+ case MatrixRelationShipOwnerStrategy.OTHER_VALUE:
+ label = Messages.MatrixRelationshipOwnerStrategyLabelProvider_Other;
+ break;
+ default:
+ label = instance.getName();
+ }
+ }
+ return label;
+ }
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
index a73fd149928..75850bc24c6 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.architecture;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation
Bundle-Vendor: %providerName
@@ -22,5 +22,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml
index 06fa013a04e..32eacb4deec 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml
@@ -8,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.ui.architecture</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top