added delay support

Author: AjroudRami

src/main/java/stateMachine/Caller.java

@@ -3,6 +3,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import static java.lang.Thread.sleep;
+
 /**
  * Created by Rami on 12/03/2017.
  */
@@ -11,23 +13,30 @@ public class Caller implements Callable {
     Object calledObject;
     Method calledMethod;
     Object[] args;
+    int delay;
 
     public Caller(){
     }
 
-    public Caller(Object calledObject, Method calledMethod){
+    public Caller(Object calledObject, Method calledMethod, int delay){
         this.calledMethod = calledMethod;
         this.calledObject = calledObject;
+        this.delay = 0;
     }
 
-    public Caller(Object calledObject, Method calledMethod, Object[] args){
-        this(calledObject, calledMethod);
+    public Caller(Object calledObject, Method calledMethod, Object[] args, int delay){
+        this(calledObject, calledMethod, delay);
         this.args = args;
     }
 
     public void call(){
         new Thread(new Runnable(){
             public void run(){
+                try {
+                    sleep(delay);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
                 try {
                     if(args==null){
                         calledMethod.invoke(calledObject);

src/main/java/stateMachine/EventSender.java

@@ -5,9 +5,10 @@
  */
 public class EventSender extends Caller {
 
-    public EventSender(String event, AbstractStateMachine stateMachine){
+    public EventSender(String event, AbstractStateMachine stateMachine, int delay){
         super.calledObject = stateMachine;
         super.args = new String[] {event};
+        super.delay = delay;
         try {
             super.calledMethod = super.calledObject.getClass().getMethod("notifyEvent", String.class);
         } catch (NoSuchMethodException e) {

src/main/java/stateMachine/GStateMachine.java

@@ -5,9 +5,6 @@
 public class GStateMachine extends AbstractStateMachine{
 public GStateMachine(){
 super();
-super.stateList.add( new State().setId("State_1").setIsInit(false).addTransition(new Transition().setTo(new State("State_2")).addTriggerEvent("Transition_9")));
-super.stateList.add( new State().setId("State_2").setIsInit(false).addOnEntry(new Event("aezge").addCallable(new EventSender("aezge", this))).addOnExit(new Event("zerzer").addCallable(new EventSender("zerzer", this))));
-super.stateList.add( new State().setId("State_4").setIsInit(false));
 super.linkStates();
 super.init();
 }}

src/main/java/stateMachine/SCXMLToJava.java

@@ -99,7 +99,9 @@ private String parseSend(Element e, String methSuffix){
                 Element element = (Element)tNode;
                 if(element.getTagName().equals("send")) {
                     String eventName = element.getAttribute("event");
-                    result += ".add"+ methSuffix +"(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this)))";
+                    String delay = element.getAttribute("delay");
+                    delay = (delay=="")?"0":delay;
+                    result += ".add"+ methSuffix +"(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this,"+delay+")))";
                 }
             }
         }
@@ -136,7 +138,9 @@ private String parseSentEvents(Element e) {
                 Element element = (Element)tNode;
                 if(element.getTagName().equals("send")) {
                     String eventName = element.getAttribute("event");
-                    result += ".addTriggeredEvent(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this)))";
+                    String delay = element.getAttribute("delay");
+                    delay = (delay=="")?"0":delay;
+                    result += ".addTriggeredEvent(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this,"+delay+")))";
                 }
             }
         }

src/main/java/stateMachine/Transition.java

@@ -83,15 +83,15 @@ public boolean hasSentEvent(String name){
     public void connectToEvent(String eventName, Object object, Method method) {
         for(Event e : sentEvents){
             if(e.getName().equals(eventName)){
-                e.addCallable(new Caller(object, method));
+                e.addCallable(new Caller(object, method, 0));
             }
         }
     }
 
     public void connectToEvent(String eventName, Object object, Method method, Object[] args){
         for(Event e : sentEvents){
             if(e.getName().equals(eventName)){
-                e.addCallable(new Caller(object, method, args));
+                e.addCallable(new Caller(object, method, args, 0));
             }
         }
     }