Delete "conjugated" attribute from Port stereotype within FCM profile, since already supported by UML.

2 files changed, 12 insertions, 5 deletions

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
index 11a52a2a333..3d6ab806fa1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
@@ -33,6 +33,12 @@ import org.eclipse.uml2.uml.Type;
  * 
  * Creates a fixed template binding that binds T (of the extended Port) to the used data type
  * 
+ * Here, the idea is that the port type is a classifier, e.g. the data type that is
+ * transported by a DDS port. The port kind is the extended port, e.g. DDSWrite.
+ * 
+ * The derived property isExtended of FCM port-kind is true, if the class representing the port-kind owns at least one
+ * port
+ * 
  * @author ansgar
  * 
  */
@@ -44,12 +50,12 @@ public class ExtendedPort implements IMappingRule {
 
 	public Interface getProvided(org.eclipse.papyrus.FCM.Port p, InstanceSpecification config)
 	{
-		return getDerived(p, p.isConjugated(), config);
+		return getDerived(p, p.getBase_Port().isConjugated(), config);
 	}
 
 	public Interface getRequired(org.eclipse.papyrus.FCM.Port p, InstanceSpecification config)
 	{
-		return getDerived(p, !p.isConjugated(), config);
+		return getDerived(p, !p.getBase_Port().isConjugated(), config);
 	}
 
 	public Interface getDerived(org.eclipse.papyrus.FCM.Port extPort, boolean isConjugated, InstanceSpecification config)
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
index a096e5fdc27..c9c58eab5a6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort2.java
@@ -14,7 +14,8 @@ import org.eclipse.uml2.uml.Type;
 
 /**
  * An extended Port in the sense of the DDS4CCM standard: a port typed with a component
- * type. Since the component typing the port can have multiple provided and required
+ * type (the extended port, not the data type that is transported). Since the component typing
+ * the port can have multiple provided and required
  * ports, the ports are implicitly owned by the port. Conjugation on the level of an extended
  * port level will conjugate all ports of the component typing the port.
  * 
@@ -37,12 +38,12 @@ public class ExtendedPort2 implements IMappingRule {
 
 	public Interface getProvided(org.eclipse.papyrus.FCM.Port p, InstanceSpecification config)
 	{
-		return getDerived(p, p.isConjugated(), config);
+		return getDerived(p, p.getBase_Port().isConjugated(), config);
 	}
 
 	public Interface getRequired(org.eclipse.papyrus.FCM.Port p, InstanceSpecification config)
 	{
-		return getDerived(p, !p.isConjugated(), config);
+		return getDerived(p, !p.getBase_Port().isConjugated(), config);
 	}
 
 	public Interface getDerived(org.eclipse.papyrus.FCM.Port extPort, boolean isConjugated, InstanceSpecification config)