diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java index 93fd849c5f13546952208e5504529ad6e2a8048d..1d49e2267c6a94d9a666de050d036998c07ceb3f 100644 --- a/src/avatartranslator/AvatarRelation.java +++ b/src/avatartranslator/AvatarRelation.java @@ -72,8 +72,8 @@ public class AvatarRelation extends AvatarElement { } - public boolean hasSignal() { - return (signals1.constains(as) || signals2.contains(as)); + public boolean containsSignal(AvatarSignal _as) { + return (signals1.contains(_as) || signals2.contains(_as)); } public void setAsynchronous(boolean _b) { diff --git a/src/avatartranslator/AvatarSpecification.java b/src/avatartranslator/AvatarSpecification.java index 314830959a4070709b94f4ffdad9bd8596de9cc3..9350c9a25d065f98f001699d1f7ee5a2ca547b8a 100644 --- a/src/avatartranslator/AvatarSpecification.java +++ b/src/avatartranslator/AvatarSpecification.java @@ -72,10 +72,10 @@ public class AvatarSpecification extends AvatarElement { return relations; } - public void isASynchronousSignal(AvatarSignal as) { + public boolean isASynchronousSignal(AvatarSignal _as) { for(AvatarRelation ar: relations) { - if (ar.hasSignal(as)) { - return !(as.isAsynchronous()); + if (ar.containsSignal(_as)) { + return !(ar.isAsynchronous()); } } diff --git a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java index f552fccd32819dbafbabea53a819879fc8ed230d..70e6eb7654d191212b332ed8ff733ba5009eec5a 100755 --- a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java +++ b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java @@ -703,7 +703,7 @@ public class AVATAR2UPPAAL { public String [] manageSynchro(AvatarBlock _block, AvatarActionOnSignal _aaos) { AvatarSignal as = _aaos.getSignal(); - if (spec.isASynchronousSignal(as)) { + if (avspec.isASynchronousSignal(as)) { return manageSynchroSynchronous(_block, _aaos); } else { return manageSynchroSynchronous(_block, _aaos);