From ebd707b9ec4e73131ce52eb6e00ea5e5e2cb4d19 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Mon, 5 Jul 2010 10:00:43 +0000
Subject: [PATCH] Avatar asynchronous messages: update
---
src/avatartranslator/AvatarRelation.java | 4 ++--
src/avatartranslator/AvatarSpecification.java | 6 +++---
src/avatartranslator/touppaal/AVATAR2UPPAAL.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java
index 93fd849c5f..1d49e2267c 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 314830959a..9350c9a25d 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 f552fccd32..70e6eb7654 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);
--
GitLab