From bc3955dbf50e182b643dd45f3e8f9f7144df83ba Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 3 Feb 2016 15:26:36 +0000
Subject: [PATCH] Resolving bug on avatar timers
---
src/avatartranslator/AvatarBlock.java | 7 ++++---
src/avatartranslator/AvatarStateMachine.java | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/avatartranslator/AvatarBlock.java b/src/avatartranslator/AvatarBlock.java
index 6cc1f7b2a8..d5e2f79045 100644
--- a/src/avatartranslator/AvatarBlock.java
+++ b/src/avatartranslator/AvatarBlock.java
@@ -429,13 +429,14 @@ public class AvatarBlock extends AvatarElement {
}
}
-
+ value = new AvatarAttribute("__timerValue", AvatarType.INTEGER, this, getReferenceObject());
+ addAttribute(value);
// Modify the state machine
if (asm.removeTimers(this, "__timerValue")) {
// Add an attribute for the timer value
- value = new AvatarAttribute("__timerValue", AvatarType.INTEGER, this, getReferenceObject());
- addAttribute(value);
+ //value = new AvatarAttribute("__timerValue", AvatarType.INTEGER, this, getReferenceObject());
+ //addAttribute(value);
}
// Remove Timer attribute
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index 92ee88d443..8cbdd568f2 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -854,6 +854,7 @@ public class AvatarStateMachine extends AvatarElement {
if (previous.size() == 1) {
if (previous.get(0) instanceof AvatarTransition) {
AvatarTransition at = (AvatarTransition)(previous.get(0));
+ TraceManager.addDev("Timer value setting=" + ast.getTimerValue());
at.addAction(timerAttributeName + " = " + ast.getTimerValue());
} else {
TraceManager.addError("The element before a set time is not a transition!");
--
GitLab