Преглед на файлове

Added support for statemachine exit sequences.

markus.muehlbrandt@itemis.de преди 13 години
родител
ревизия
66389cad33
променени са 12 файла, в които са добавени 20 реда и са изтрити 10 реда
  1. 6 0
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/CustomCycleBasedStatemachine.xpt
  2. 2 0
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/IStatemachine.xpt
  3. 2 2
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/Naming.ext
  4. 2 0
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/IStatemachine.java
  5. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/interfacetest/InterfaceTestCycleBasedStatemachine.java
  6. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_deephistory/Test_DeepHistoryCycleBasedStatemachine.java
  7. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_expression/Test_ExpressionCycleBasedStatemachine.java
  8. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_hierarchy/Test_HierarchyCycleBasedStatemachine.java
  9. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_localactions/Test_LocalActionsCycleBasedStatemachine.java
  10. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_parallelregions/Test_ParallelRegionsCycleBasedStatemachine.java
  11. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_shallowhistory/Test_ShallowHistoryCycleBasedStatemachine.java
  12. 1 1
      test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_transition/Test_TransitionCycleBasedStatemachine.java

+ 6 - 0
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/CustomCycleBasedStatemachine.xpt

@@ -310,6 +310,12 @@ public class 
 	}
 	«ENDIF-»
 	
+	«IF exitSequence.steps.size > 0-»
+	public void «exitSequenceName()»(){
+		«EXPAND ActionCode FOREACH exitSequence.steps-»
+	}
+	«ENDIF»
+	
 «EXPAND ConditionMethodsImplement FOREACH this.states-»
 «EXPAND StatementMethodsImplement FOREACH this.states-»
 «EXPAND EnterMethodImplement FOREACH this.states-»

+ 2 - 0
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/IStatemachine.xpt

@@ -25,6 +25,8 @@ public interface IStatemachine {
 	public void init();
 
 	public void runCycle();
+	
+	public void enter();
 }
 «ENDFILE-»
 «ENDDEFINE»

+ 2 - 2
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/Naming.ext

@@ -94,10 +94,10 @@ String entryActionFunctionName(Step this) : "entryAction" + getName(state());
 String exitActionFunctionName(Step this) : "exitAction" + getName(state());
 String enterSequenceName(Step this) : "enterSequence"+getName(state()); 
 String enterSequenceName(ExecutionState this) : "enterSequence"+getName();
-String enterSequenceName(ExecutionFlow this) : "enterSequenceStatechart"+getName();
+String enterSequenceName(ExecutionFlow this) : "enter";
 String exitSequenceName(Step this) : "exitSequence"+getName(state()); 
 String exitSequenceName(ExecutionState this) : "exitSequence"+getName();
-String exitSequenceName(ExecutionFlow this) : "enterSequenceStatechart"+getName();
+String exitSequenceName(ExecutionFlow this) : "exit";
 
 isEffect(Step step) : (! Check.isInstance(step)) && Reaction.isInstance(step.eContainer) ;
 isReactionCheck(Step step) : Reaction.isInstance(step.eContainer) && Check.isInstance(step);

+ 2 - 0
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/IStatemachine.java

@@ -15,4 +15,6 @@ public interface IStatemachine {
 	public void init();
 
 	public void runCycle();
+
+	public void enter();
 }

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/interfacetest/InterfaceTestCycleBasedStatemachine.java

@@ -74,7 +74,7 @@ public class InterfaceTestCycleBasedStatemachine implements IStatemachine {
 		return interfaceThird;
 	}
 
-	public void enterSequenceStatechartInterfaceTest() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_deephistory/Test_DeepHistoryCycleBasedStatemachine.java

@@ -62,7 +62,7 @@ public class Test_DeepHistoryCycleBasedStatemachine implements IStatemachine {
 		return interfaceDefault;
 	}
 
-	public void enterSequenceStatechartTest_DeepHistory() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_expression/Test_ExpressionCycleBasedStatemachine.java

@@ -68,7 +68,7 @@ public class Test_ExpressionCycleBasedStatemachine implements IStatemachine {
 		return interfaceOther;
 	}
 
-	public void enterSequenceStatechartTest_Expression() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_hierarchy/Test_HierarchyCycleBasedStatemachine.java

@@ -62,7 +62,7 @@ public class Test_HierarchyCycleBasedStatemachine implements IStatemachine {
 		return interfaceDefault;
 	}
 
-	public void enterSequenceStatechartTest_Hierarchy() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_localactions/Test_LocalActionsCycleBasedStatemachine.java

@@ -96,7 +96,7 @@ public class Test_LocalActionsCycleBasedStatemachine
 		return interfaceDefault;
 	}
 
-	public void enterSequenceStatechartTest_LocalActions() {
+	public void enter() {
 		cycleStartTime = System.currentTimeMillis();
 		enterSequenceState1();
 	}

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_parallelregions/Test_ParallelRegionsCycleBasedStatemachine.java

@@ -64,7 +64,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 		return interfaceDefault;
 	}
 
-	public void enterSequenceStatechartTest_ParallelRegions() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_shallowhistory/Test_ShallowHistoryCycleBasedStatemachine.java

@@ -62,7 +62,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine implements IStatemachine
 		return interfaceDefault;
 	}
 
-	public void enterSequenceStatechartTest_ShallowHistory() {
+	public void enter() {
 		enterSequenceState1();
 	}
 

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_transition/Test_TransitionCycleBasedStatemachine.java

@@ -119,7 +119,7 @@ public class Test_TransitionCycleBasedStatemachine
 		return EventEvent10;
 	}
 
-	public void enterSequenceStatechartTest_Transition() {
+	public void enter() {
 		cycleStartTime = System.currentTimeMillis();
 		enterSequenceState1();
 	}