Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2016-10-11 04:13:52 -0400
committerPierre-Charles David2016-10-11 08:37:26 -0400
commit972f647f700cb5a2b681825a684e380f988d3db5 (patch)
tree126d654d4f2b40b62d9ff2d1288896e02cb9deaf
parentd2ccbc395879c7f37408aaf98e87a1b46de73e68 (diff)
downloadorg.eclipse.sirius-972f647f700cb5a2b681825a684e380f988d3db5.tar.gz
org.eclipse.sirius-972f647f700cb5a2b681825a684e380f988d3db5.tar.xz
org.eclipse.sirius-972f647f700cb5a2b681825a684e380f988d3db5.zip
[doc] Fix typo
Change-Id: I481593d870b3b205287a7d177c7fa2745e4e4a2e Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.html2
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.textile2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.html b/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.html
index 2570f0a848..ca0ecd5bee 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.html
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.html
@@ -189,7 +189,7 @@
<a href="../general/ToolsSpecification.html">Refer to Tools specification</a>
</p>
<h2 id="mappings">Tree Item Mappings</h2>
- <p>Trees are recursive by nature. There contents is specified using a single concept of
+ <p>Trees are recursive by nature. Their contents is specified using a single concept of
<em>Tree Item</em> mapping which can be composed recursively. A
<em>Tree Description</em> contains
<em>Tree Item</em> mappings which define which elements will appear at the top-level of the tree, while each
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.textile b/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.textile
index db10e3eb3d..a5d4121a2a 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/trees/Trees.textile
@@ -70,7 +70,7 @@ h4(#tools_specification). Tools Specification
h2(#mappings). Tree Item Mappings
-Trees are recursive by nature. There contents is specified using a single concept of _Tree Item_ mapping which can be composed recursively. A _Tree Description_ contains _Tree Item_ mappings which define which elements will appear at the top-level of the tree, while each _Tree Item_ mapping can contain sub-mappings which define its own direct content. If an element (the tree or a tree item mapping) contains several sub-mappings, the element's content will appear in the order of the mappings: first all the instances of the first mapping, then the instances of the second one, etc.
+Trees are recursive by nature. Their contents is specified using a single concept of _Tree Item_ mapping which can be composed recursively. A _Tree Description_ contains _Tree Item_ mappings which define which elements will appear at the top-level of the tree, while each _Tree Item_ mapping can contain sub-mappings which define its own direct content. If an element (the tree or a tree item mapping) contains several sub-mappings, the element's content will appear in the order of the mappings: first all the instances of the first mapping, then the instances of the second one, etc.
A _Tree Item_ mapping is defined by a _Domain Class_, a _Semantic Candidates Expression_ and an optional _Precondition Expression_ (in the _Advanced_ category). The _Semantic Candidates Expression_ indicates where to look in the semantic model for elements which should be represented by the mapping. The expression is evaluated in the context of the parent's semantic element (the parent being either the tree itself or the parent item). It should return a set of semantic elements. Only those which are instances of the specified _Domain Class_ and which also validate the optional _Precondition expression_ are retained and actually represented as instances of this mapping. The semantic element thus associated to each tree item is called the item's _target_ element.

Back to the top