Merge "[558428] Configure jacoco plugin to create coverage reports" into develop
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/docu/model_components.textile b/plugins/org.eclipse.app4mc.amalthea.model.help/docu/model_components.textile
index ea19ad7..ce8aca7 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/docu/model_components.textile
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/docu/model_components.textile
@@ -17,11 +17,9 @@
!(scale)../pictures/model_components_interface.png!
-*TODO* implemented interfaces of a connector
+h3. Architecture of Systems / Composites
-h3. Structure of Systems / Composites
-
-The inner structure of a System or a Composite is defined with the ISystem interface. Both elements contain component instances and connectors. The ports of the instances and the containing structure can be identified as QualifiedPort.
+The inner architecture of a System or a Composite is defined with the ISystem interface. Both elements contain component instances and connectors. The ports of the instances and the containing architecture can be identified as QualifiedPort.
!(scale)../pictures/model_components_composition.png!
@@ -48,10 +46,10 @@
Connection-instances and is used to define the architecture of a technical system.
A 'Composite' is a special component type to aggregate Component- and Connection-instances compositely.
-So it could be used to create hierarchical component structures.
+So it could be used to create hierarchical component architectures.
System and Composite implement the interface 'ISystem'.
-The following diagram shows the main elements to represent the hierarchical structure.
+The following diagram shows the main elements to represent the hierarchical architecture.
!../pictures/model_components_isystem.png!
@@ -59,7 +57,14 @@
h4. ComponentInstance and Connector
-The 'ComponentInstance' and the 'Connector' can be created within a 'System' or a 'Composite'. 'ComponentInstances' are used to represent instances of component- or composite-types. The 'Connector' class is used to connect the component instances to each other via their Ports. The connector contains a source and target 'QualifiedPort'.
+The 'ComponentInstance' and the 'Connector' can be created within a 'System' or a 'Composite'. 'ComponentInstances' are used to represent instances of component- or composite-types. The 'Connector' class is used to connect the component instances to each other via their Ports. The connector contains a source and target 'QualifiedPort'.
+
+
+**TODO** List of mappings is not visible in any picture?
+
+To specfiy the implementation details of a connection between ports it is possible to specify an interface/channel pair for each connector. This links additional information from the channel implementation like the access behavior to the connector. The connector can contain multiple interface/channel pairs since an interface can contain multiple sub-interfaces realized by multiple data types implemented by multiple channels.
+
+
h4. QualifiedPort
@@ -71,9 +76,13 @@
The 'ComponentPort' class contains the attribute 'kind' to set the port direction.
The attribute 'interface name' can be used to refer to an external definition, e.g. described in detail with the Franca IDL.
+h4. Structures
+
+Structures enables structuring/ordering of components, composites and interfaces. In contrasts to namespaces the structure does not add to the qualified name but supports the design of a hierarchical structure to order the elements in a package/folder like scheme.
h3. Example
+
h4. Diagram
The diagram of the example shows a composite 'A' that contains two component instances 'X' and 'Y' of type 'B'. The connections between the ports are named 'c1' to 'c4'. The grounded port 'in_3' of instance 'X' (intentionally left unconnected) is marked green. The second unconnected port 'in_2' of instance 'Y' is unspecified. It is marked red and has to be changed, either declared as grounded or connected to another port.
