V1

Author: AjroudRami

builds/scxml-to-fsm-1.0-SNAPSHOT-jar-with-dependencies.jar

@@ -1,6 +1,4 @@
-import stateMachine.Event;
-import stateMachine.MyStateMachine;
-
+import stateMachine.AbstractStateMachine;
 import java.util.Scanner;
 
 /**
@@ -9,7 +7,7 @@
 public class Main2 {
 
     public static void main(String[] args){
-        MyStateMachine ms = new MyStateMachine();
+        AbstractStateMachine st;
         Scanner sc = new Scanner(System.in);
         String input = "";
         while(!input.equals("exit")){

src/main/java/Main2.java

@@ -0,0 +1,16 @@
+package exemple;
+
+import stateMachine.*;
+/**
+Generated By SCXMLToJava class
+**/
+public class GStateMachine extends AbstractStateMachine{
+public GStateMachine(){
+super();
+super.stateList.add( new State().setId("standby").setIsInit(false).addTransition(new Transition().setTo(new State("opening")).addTriggerEvent("someone").addTriggeredEvent(new Event("open").addCallable(new EventSender("open", this,0)))));
+super.stateList.add( new State().setId("opening").setIsInit(false).addTransition(new Transition().setTo(new State("waiting")).addTriggerEvent("opened")));
+super.stateList.add( new State().setId("waiting").setIsInit(false).addTransition(new Transition().setTo(new State("closing")).addTriggerEvent("endWaiting").addTriggeredEvent(new Event("close").addCallable(new EventSender("close", this,0)))).addOnEntry(new Event("endWaiting").addCallable(new EventSender("endWaiting", this,1000))));
+super.stateList.add( new State().setId("closing").setIsInit(false).addTransition(new Transition().setTo(new State("standby")).addTriggerEvent("closed")));
+super.linkStates();
+super.init();
+}}

src/main/java/exemple/GStateMachine.java

@@ -0,0 +1,30 @@
+package exemple;
+
+import stateMachine.StateMachine;
+
+/**
+ * Created by user on 15/04/2017.
+ */
+public class Main {
+
+
+    public static void main(String[] args){
+
+        StateMachine sm = new GStateMachine();
+        Porte porte = new Porte(sm);
+
+        try {
+            sm.connectToEvent("open", porte, porte.getClass().getMethod("open"));
+            sm.connectToEvent("close", porte, porte.getClass().getMethod("close"));
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+
+        Thread t = new Thread(porte);
+        t.start();
+        sm.start();
+
+        //On simule l'arrivée d'une personne
+        sm.notifyEvent("someone");
+    }
+}

src/main/java/exemple/Main.java

@@ -0,0 +1,51 @@
+package exemple;
+
+import stateMachine.StateMachine;
+
+import java.lang.reflect.InvocationTargetException;
+
+import static java.lang.Thread.sleep;
+
+/**
+ * Created by user on 15/04/2017.
+ */
+public class Porte implements Runnable{
+
+    private StateMachine sm;
+
+    public Porte(StateMachine machine){
+        this.sm = machine;
+    }
+
+
+    public void run() {
+        new Thread(new Runnable(){
+            public void run(){
+                while(true){
+
+                }
+            }
+        }).start();
+    }
+
+    //Simule l'ouverture de la porte
+    public void open(){
+        try {
+            Thread.sleep(1000);
+            sm.notifyEvent("opened");
+            System.out.println("porte ouverte");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void close(){
+        try {
+            Thread.sleep(1000);
+            sm.notifyEvent("closed");
+            System.out.println("porte fermé");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/exemple/Porte.java

@@ -23,7 +23,7 @@ public class SCXMLToJava {
     private final String messageHeader="/**\nGenerated By SCXMLToJava class\n**/\n";
     private final String classNameHeader="public class GStateMachine extends AbstractStateMachine" + openInst + "\n";
     private final String constructorHeader="public GStateMachine()" + openInst + "\n";
-    private final String fileName = "GStateMachine.java";
+    private final String fileName = "exemple/GStateMachine.java";
     private String javaCode;
     private File outputFile;
 
@@ -99,7 +99,7 @@ else if(e.getTagName().equals("onexit")){
 
     private String parseSend(Element e, String methSuffix){
         String result = "";
-        NodeList list = e.getElementsByTagName("send");
+        NodeList list = e.getChildNodes();
         for(int i =0; i < list.getLength(); i++){
             Node tNode = list.item(i);
             if(tNode.getNodeType() == Node.ELEMENT_NODE) {
@@ -109,12 +109,19 @@ private String parseSend(Element e, String methSuffix){
                     String delay = element.getAttribute("delay");
                     delay = (delay=="")?"0":delay;
                     result += ".add"+ methSuffix +"(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this,"+delay+")))";
+                }else if(element.getTagName().equals("raise")){
+                    String eventName = element.getAttribute("event");
+                    String delay = element.getAttribute("delay");
+                    delay = (delay=="")?"0":delay;
+                    result += ".add"+ methSuffix +"(new Event(\"" + eventName + "\").addCallable(new EventSender(\""+ eventName+"\", this,"+delay+")).setType(Event.Type.RAISE))";
                 }
             }
         }
         return result;
     }
 
+
+
     private String parseTransitions(Node stateNode) {
         String result = "";
         NodeList transitions = stateNode.getChildNodes();

src/main/java/generator/SCXMLToJava.java

@@ -23,6 +23,7 @@ public void run() {
         while(run){
             Event e = getNextEvent();
             if(e != null){
+                System.out.println("Sending event " + e.getName());
                 stateMachine.triggerEvent(e.getName());
             }
         }

src/main/java/stateMachine/EventHandler.java

@@ -9,10 +9,15 @@
  * Created by Rami on 08/03/2017.
  */
 public class State implements Serializable {
+
+    //event name
     private String id;
+    // is the state an initial state
     private boolean isInit;
     private List<Transition> transitions;
+    //Events triggered on entry
     private List<Event> onEntry;
+    //Event triggered on exit
     private List<Event> onExit;
 
     public State(){
@@ -48,13 +53,19 @@ public State notifyEvent(String event) {
         return this;
     }
 
+    /**
+     * This method is called when entering the state and triggers all the event that need to be triggered at this point
+     */
     private void enter() {
         for(Event e: onEntry){
             e.trigger();
         }
         System.out.println("enter state " + this.id);
     }
 
+    /**
+     * This method is called when exiting the state and triggers all the event that need to be triggered at this point
+     */
     private void exit(){
         for(Event e: onExit){
             e.trigger();
@@ -87,7 +98,7 @@ public State addOnExit(Event e){
         return this;
     }
 
-    //TODO
+
     public void connectToEvent(String eventName, Object object, Method method){
         for(Event e : onEntry){
             if(e.getName().equals(eventName)){
@@ -106,7 +117,6 @@ public void connectToEvent(String eventName, Object object, Method method){
         }
     }
 
-    //TODO
     public void connectToEvent(String eventName, Object object, Method method, Object[] args){
         for(Event e : onEntry){
             if(e.getName().equals(eventName)){
@@ -124,7 +134,6 @@ public void connectToEvent(String eventName, Object object, Method method, Objec
             t.connectToEvent(eventName, object, method, args);
         }}
 
-    //TODO
     public void connectToEvent(String eventName, Callable callable){
         for(Event e : onEntry){
             if(e.getName().equals(eventName)){
@@ -143,7 +152,6 @@ public void connectToEvent(String eventName, Callable callable){
         }
     }
 
-    //TODO
     public boolean hasSentEvent(String name) {
         for (Event e : onEntry) {
             if (e.getName().equals(name)) {