Correction of a bug that affects tests using mvn test and error prevention on EventHandler

Author: AjroudRami

src/main/java/generator/SCXMLToJava.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 = "exemple/GStateMachine.java";
+    private final String fileName = "GStateMachine.java";
     private String javaCode;
     private File outputFile;
 

src/main/java/stateMachine/EventHandler.java

@@ -21,11 +21,16 @@ public EventHandler(AbstractStateMachine stateMachine){
     public void run() {
         start();
         while(run){
-            Event e = getNextEvent();
-            if(e != null){
-                System.out.println("Sending event " + e.getName());
-                stateMachine.triggerEvent(e.getName());
+            try{
+                Event e = getNextEvent();
+                if(e != null){
+                    System.out.println("Sending event " + e.getName());
+                    stateMachine.triggerEvent(e.getName());
+                }
+            }catch(Exception e){
+                System.err.println(e.getMessage());
             }
+
         }
     }
 
@@ -38,15 +43,23 @@ public void start(){
     }
 
     private Event getNextEvent(){
+        try {
         for(int i = 0; i<eventsStack.size(); i++){
             if(eventsStack.get(i).getType().equals(Event.Type.SEND)){
                 return eventsStack.remove(i);
             }
         }
-        for(int i = 0; i<eventsStack.size(); i++){
-            if(eventsStack.get(i).getType().equals(Event.Type.RAISE)){
-                return eventsStack.remove(i);
+        }catch (java.lang.NullPointerException e){
+            System.err.println(e.getMessage());
+        }
+        try {
+            for (int i = 0; i < eventsStack.size(); i++) {
+                if (eventsStack.get(i).getType().equals(Event.Type.RAISE)) {
+                    return eventsStack.remove(i);
+                }
             }
+        }catch (java.lang.NullPointerException e){
+            System.err.println(e.getMessage());
         }
         return null;
     }

src/main/java/stateMachine/State.java

@@ -58,6 +58,7 @@ public State notifyEvent(String event) {
      */
     private void enter() {
         for(Event e: onEntry){
+            System.out.println("ONENTRY: " + e.getName());
             e.trigger();
         }
         System.out.println("enter state " + this.id);