Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-03-12 17:32:19 +0000
committerHenrik Rentz-Reichert2012-03-12 17:32:19 +0000
commitb9559d2faf6d3be52febfbd2d60d43f266ed896f (patch)
treed9c05604670295fc45cb15d0cfade3671810691e
parent18732a94a4ef4e94ee12fe09edb398947c3eb65b (diff)
downloadorg.eclipse.etrice-b9559d2faf6d3be52febfbd2d60d43f266ed896f.tar.gz
org.eclipse.etrice-b9559d2faf6d3be52febfbd2d60d43f266ed896f.tar.xz
org.eclipse.etrice-b9559d2faf6d3be52febfbd2d60d43f266ed896f.zip
[core.room] bug fix for validation of multiple connectable data driven relay ports
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
index 5437467fb..bfa2665b5 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
@@ -263,16 +263,19 @@ public class ValidationUtil {
public static boolean isMultipleConnectable(Port port, ActorContainerRef ref) {
if (port.isReplicated())
return true;
-
- if (port.getProtocol().getCommType()==CommunicationType.DATA_DRIVEN) {
- if (ref==null && !port.isConjugated())
- return false;
- if (ref!=null && port.isConjugated())
+
+ if (port.getProtocol().getCommType() == CommunicationType.DATA_DRIVEN) {
+ if (ref == null) {
+ if (isRelay(port))
+ return !port.isConjugated();
+ else
+ return port.isConjugated();
+ } else if (ref != null && port.isConjugated())
return false;
-
+
return true;
}
-
+
return false;
}

Back to the top