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/doc
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/doc')
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml2
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/images/matrix/ThePropertyViewForMatrix.pngbin32390 -> 42536 bytes
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixDevDoc.mediawiki18
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixUserDoc.mediawiki5
5 files changed, 24 insertions, 3 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
index ca9f38a26a3..31c13a1c841 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-Name: Papyrus Table Documentation
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
index 4cf3178b9d8..8a1e9647f6e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable.doc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/images/matrix/ThePropertyViewForMatrix.png b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/images/matrix/ThePropertyViewForMatrix.png
index 012223acc49..c0a1186f316 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/images/matrix/ThePropertyViewForMatrix.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/images/matrix/ThePropertyViewForMatrix.png
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixDevDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixDevDoc.mediawiki
index 3897397528f..49515aeb4ed 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixDevDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixDevDoc.mediawiki
@@ -56,6 +56,21 @@ Since Papyrus 3.0 (Eclipse Oxygen), Papyrus provides a generic matrix for UML Re
***'''cellContentsFilter''': a IBooleanEObjectExpression to filter (if required) the contents of the cell in order to display only relationship choosen by the user;
***'''editedElement''': the EClass (UML in our usecase) representing the relationship edited by the table;
*a new EPackage called '''wrapper''' has been created. It provides wrappers to be able to reference easily several kind of objects. Currently, only the implementation for EObject is provided, but extending it, we will be able to reference object which are not EObject too.
+***'''relationshipOwnerStrategy''': an enumeration value used to define the strategy to choose the owner of the created relationships.
+***'''relationshipOwner''': the owner chosen by the user, when the '''relationshipOwnerStrategy''' enumeration has the value '''Default'''
+***'''relationshipOwnerFeature''': the containment feature in the owner, defined by the user, used to contain the created relationships. This field is not yet used.
+**'''MatrixRelationShipDirection''': an enumeration used to define the direction of the relations displayed in the table:
+***'''NONE''': we display all directions in the matrixes (from row to columns AND from columns to rows),
+***'''FROM_ROW_TO_COLUMN''',
+***'''FROM_COLUMN_TO_ROW'''.
+**'''MatrixRelationShipOwnerStrategy''': an enumeration used to define the owner of the created relationships:
+***'''DEFAULT''': the owner will be calculated by Papyrus,
+***'''TABLE_CONTEXT''': the owner will be the context of the table,
+***'''ROW_OWNER''': the owner will be the row's owner,
+***'''ROW_AS_OWER''': the owner will be the row itself,
+***'''COLUMN_OWNER''': the owner will be the column's owner,
+***'''COLUMN_AS_OWNER''': the owner will be the column itself,
+***'''OTHER''': the owner is given by the user, using the field <code>'''GenericRelationshipMatrixCellEditorConfiguration#relationshipOwner'''</code>
*in '''TableConfiguration''':
**a new property '''ownedCellEditorConfigurations''', used to define the initial matrix configuration;
*in '''Table'''
@@ -93,7 +108,8 @@ Here, we will explain you how to create a matrix dedicated to a given relationsh
##'''Edited Element''': an element type representing the relationship edited in your table. This field is typed with the object '''ElementTypeConfiguration'''. To be able to define this field, you must:
###load a file '''*.elementtypesconfigurations'''. You can have defined your own element types or reuse a Papyrus one. In all cases, you must have the plugin with containing this file in your workspace.
###open the tableconfiguration file in text mode, to check that the reference to the element type is defined as <code>href="platform:/plugin/myFilePath"</code> and not as <code>href="platform:/resource/myFilePath"</code> or as <code>href="../../../myFilePath"</code>.
-##*the final matrix will work only if a cell editor managing the chosen element type exists
+###*the final matrix will work only if a cell editor managing the chosen element type exists
+###'''relationshipOwnerStrategy''': you should define the relationship owner strategy for your new matrix.
#Define the feature to listen (same behavior than TreeTable)
##Edit the '''TreeFillingConfiguration''' for rows and columns
##define the feature to listen (wrapped in a IAxis)
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixUserDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixUserDoc.mediawiki
index 83dfd6e3824..01fb77432b9 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixUserDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/matrixUserDoc.mediawiki
@@ -13,6 +13,10 @@ Some illustration are available after the description of the steps.
##fill the field '''Relation Kind''' to select the kind of relationship managed by the table,
##fill the field '''Direction''' to define the direction of the relationship managed by the table,
##if required, fill the field '''Contents Filter''', to be more precise in the displayed relationship.
+##if required, define the '''Owner Strategy''', to define which element will be the owner of the created relationships.
+##*'''Default''': this is Papyrus which is in charge to determine the owner.
+##*'''Other''': you must define yourself the owner for all created relationship, editing the next field too.
+##'''Relation Owner''': select a model element to contains all relationships created in the current matrix. A compatibility check will be done at your first cell edition in the Matrix and a dialog will be open in case of problems with your choices. This value is only used when '''Owner Strategy''' is set to '''Other'''.
#Now, if it is not already done, you can expand the rows of your table: '''Right CLick''' on the row header, then '''Expand All'''.
@@ -25,6 +29,7 @@ Some illustration are available after the description of the steps.
*the matrix property view used to configure the new matrix
[[File:images/matrix/ThePropertyViewForMatrix.png|frame|none|The Matrix property view, with the described order for its configuration.]]
+
*the result for a small model
[[File:images/matrix/MatrixResult.png|frame|none|The resulting matrix, for a small model, with its configuration displayed in the Property View]]

Back to the top