Просмотр исходного кода

fixed issue #89 (Inlining enter sequences fail for Java generator) plus extensions to issues #90 and #91

AxelTerfloth@googlemail.com 11 лет назад
Родитель
Сommit
ed31c8f82e
100 измененных файлов с 228 добавлено и 172 удалено
  1. 11 0
      plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CNamingService.xtend
  2. 11 0
      plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppNamingService.xtend
  3. 8 4
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaCodeGenerator.java
  4. 48 0
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaNamingService.xtend
  5. 5 53
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Naming.xtend
  6. 1 1
      plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Statemachine.xtend
  7. 30 10
      plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/DefaultNamingService.xtend
  8. 22 13
      plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/INamingService.java
  9. 2 1
      plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecElementMapping.xtend
  10. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/AlwaysOncycle/AlwaysOncycle.cc
  11. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/AssignmentAsExpression/AssignmentAsExpression.cc
  12. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/BitExpressions/BitExpressions.cc
  13. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/BooleanExpressions/BooleanExpressions.cc
  14. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/CKeywords/CKeywords.cc
  15. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/CastExpressions/CastExpressions.cc
  16. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/Choice/Choice.cc
  17. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ConditionalExpression/ConditionalExpression.cc
  18. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ConstantsTests/ConstantsTests.cc
  19. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/Declarations/Declarations.cc
  20. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepEntry/DeepEntry.cc
  21. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepHistory/DeepHistory.cc
  22. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/DynamicChoice/DynamicChoice.cc
  23. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/EnterState/EnterState.cc
  24. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryChoice/EntryChoice.cc
  25. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryExitSelfTransition/EntryExitSelfTransition.cc
  26. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitOnSelfTransition/ExitOnSelfTransition.cc
  27. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitState/ExitState.cc
  28. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/FeatureCalls/FeatureCalls.cc
  29. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/Guard/Guard.cc
  30. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedEntry/GuardedEntry.cc
  31. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedExit/GuardedExit.cc
  32. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithExitPoint/HistoryWithExitPoint.cc
  33. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithoutInitialStep/HistoryWithoutInitialStep.cc
  34. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/InEventLifeCycle/InEventLifeCycle.cc
  35. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/IntegerExpressions/IntegerExpressions.cc
  36. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/InternalEventLifeCycle/InternalEventLifeCycle.cc
  37. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/LocalReactions/LocalReactions.cc
  38. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalAndTests/LogicalAndTests.cc
  39. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalOrTests/LogicalOrTests.cc
  40. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/NamedInterfaceAccess/NamedInterfaceAccess.cc
  41. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/NullCheck/NullCheck.cc
  42. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/OutEventLifeCycle/OutEventLifeCycle.cc
  43. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/Parenthesis/Parenthesis.cc
  44. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/PriorityValues/PriorityValues.cc
  45. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/RaiseEvent/RaiseEvent.cc
  46. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/STextKeywordsInStatesAndRegions/STextKeywordsInStatesAndRegions.cc
  47. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/SameNameDifferentRegion/SameNameDifferentRegion.cc
  48. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistory/ShallowHistory.cc
  49. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistoryWithDeepEntry/ShallowHistoryWithDeepEntry.cc
  50. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleEvent/SimpleEvent.cc
  51. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleHierachy/SimpleHierachy.cc
  52. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/StateIsActive/StateIsActive.cc
  53. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartLocalReactions/StatechartLocalReactions.cc
  54. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/StaticChoice/StaticChoice.cc
  55. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressions.cc
  56. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncFork/SyncFork.cc
  57. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncJoin/SyncJoin.cc
  58. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/TimedTransitions/TimedTransitions.cc
  59. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/TransitionWithoutCondition/TransitionWithoutCondition.cc
  60. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/TriggerGuardExpressions/TriggerGuardExpressions.cc
  61. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/gtests/ValuedEvents/ValuedEvents.cc
  62. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AlwaysOncycle.java
  63. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AssignmentAsExpression.java
  64. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/BitExpressions.java
  65. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/BooleanExpressions.java
  66. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/CKeywords.java
  67. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/CastExpressions.java
  68. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Choice.java
  69. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ConditionalExpression.java
  70. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ConstantsTests.java
  71. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Declarations.java
  72. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DeepEntry.java
  73. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DeepHistory.java
  74. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DynamicChoice.java
  75. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EnterState.java
  76. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EntryChoice.java
  77. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EntryExitSelfTransition.java
  78. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ExitOnSelfTransition.java
  79. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ExitState.java
  80. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/FeatureCalls.java
  81. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Guard.java
  82. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/GuardedEntry.java
  83. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/GuardedExit.java
  84. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/HistoryWithExitPoint.java
  85. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/HistoryWithoutInitialStep.java
  86. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/InEventLifeCycle.java
  87. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/IntegerExpressions.java
  88. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/InternalEventLifeCycle.java
  89. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LocalReactions.java
  90. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LogicalAndTests.java
  91. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LogicalOrTests.java
  92. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/NamedInterfaceAccess.java
  93. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/NullCheck.java
  94. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/OutEventLifeCycle.java
  95. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Parenthesis.java
  96. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/PriorityValues.java
  97. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/RaiseEvent.java
  98. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/STextKeywordsInStatesAndRegions.java
  99. 1 1
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/SameNameDifferentRegion.java
  100. 0 0
      test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ShallowHistory.java

+ 11 - 0
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CNamingService.xtend

@@ -1,3 +1,14 @@
+/**
+  Copyright (c) 2014-2015 committers of YAKINDU Statechart Tools.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  	Markus Mühlbrandt - Initial contribution and API
+*/
+
 package org.yakindu.sct.generator.c
 
 import com.google.inject.Inject

+ 11 - 0
plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppNamingService.xtend

@@ -1,3 +1,14 @@
+/**
+  Copyright (c) 2014-2015 committers of YAKINDU Statechart Tools.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  	Markus Mühlbrandt - Initial contribution and API
+*/
+
 package org.yakindu.sct.generator.cpp
 
 import com.google.inject.Inject

+ 8 - 4
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaCodeGenerator.java

@@ -1,5 +1,5 @@
 /**
-  Copyright (c) 2012 committers of YAKINDU and others.
+  Copyright (c) 2012-2015 committers of YAKINDU and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -15,20 +15,22 @@ import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.generator.java.types.JavaTypeSystemAccess;
 import org.yakindu.sct.generator.java.types.OldJavaTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
+import com.google.inject.Scopes;
 import com.google.inject.util.Modules;
 
 public class JavaCodeGenerator extends AbstractJavaCodeGenerator {
-	
+
 	@Override
 	public void generate(Statechart statechart, GeneratorEntry entry) {
 		JavaGenerator delegate = getInjector(entry).getInstance(
 				JavaGenerator.class);
-		
+
 		ExecutionFlow flow = createExecutionFlow(statechart, entry);
 
 		if (isDumpSexec(entry)) {
@@ -51,9 +53,11 @@ public class JavaCodeGenerator extends AbstractJavaCodeGenerator {
 					binder.bind(ICodegenTypeSystemAccess.class).to(
 							JavaTypeSystemAccess.class);
 				}
+				binder.bind(INamingService.class).to(JavaNamingService.class)
+						.in(Scopes.SINGLETON);
 			}
 		});
-		
+
 	}
 
 }

+ 48 - 0
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaNamingService.xtend

@@ -0,0 +1,48 @@
+/*
+  Copyright (c) 2014-2015 committers of YAKINDU Statechart Tools.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  	Axel Terfloth - Initial contribution
+*/
+package org.yakindu.sct.generator.java
+
+import com.google.inject.Inject
+import java.util.Arrays
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.extensions.SExecExtensions
+import org.yakindu.sct.model.sexec.naming.DefaultNamingService
+
+/** 
+ * Specific adaption of the default naming service to the needs of the java code generator.
+ * 
+ * @author axel terfloth (terfloth@itemis.de)
+ */
+class JavaNamingService extends DefaultNamingService implements JavaKeywords {
+	
+	@Inject extension SExecExtensions
+	
+  override protected prefix(Step it, char separator) {
+		switch (it) {
+			case isCheckFunction: "check"
+			case isEntryAction: "entryAction"
+			case isExitAction: "exitAction"
+			case isEffect: "effect"
+			case isEnterSequence: "enterSequence"
+			case isDeepEnterSequence: "deepEnterSequence"
+			case isShallowEnterSequence: "shallowEnterSequence"
+			case isExitSequence: "exitSequence"
+			case isReactSequence: "react"
+			default: ""
+		}
+	}
+
+		
+	override boolean isKeyword(String name) {
+		return !Arrays::asList(KEYWORDS).findFirst[it.equalsIgnoreCase(name)].nullOrEmpty
+	}
+
+}

+ 5 - 53
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Naming.xtend

@@ -2,15 +2,12 @@ package org.yakindu.sct.generator.java
 
 import com.google.inject.Inject
 import java.util.Arrays
-import java.util.List
 import java.util.regex.Matcher
 import java.util.regex.Pattern
-import org.eclipse.emf.ecore.EObject
 import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.ExecutionNode
-import org.yakindu.sct.model.sexec.ExecutionScope
 import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.naming.INamingService
 import org.yakindu.sct.model.sgraph.Event
 import org.yakindu.sct.model.sgraph.State
 import org.yakindu.sct.model.sgraph.Variable
@@ -23,7 +20,8 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 class Naming implements JavaKeywords {
 	
 	@Inject extension Navigation
-	
+
+	@Inject extension INamingService namingService;	
 	@Inject StextNameProvider provider;
 	
 	def iStatemachine() {
@@ -184,54 +182,8 @@ class Naming implements JavaKeywords {
 	def String getNullStateName() {
 		"$NullState$";
 	}
+	
+	def functionName(Step it) { shortName }
 	
-	def functionName(Step it) {
-		switch (it) {
-			case isCheckFunction : asCheckFunction
-			case isEntryAction: asEntryActionFunction
-			case isExitAction : asExitActionFunction
-			case isEffect : asEffectFunction
-			case isEnterSequence : asEnterSequenceFunction
-			case isDeepEnterSequence : asDeepEnterSequenceFunction
-			case isShallowEnterSequence : asShallowEnterSequenceFunction
-			case isExitSequence : asExitSequenceFunction
-			case isReactSequence : asReactFunction
-			default : ""
-		} 
-	}
-	
-	def asCheckFunction(Step it) { functionName(newArrayList('check', elementName, reaction.name)) }
-	 
-	def asEffectFunction(Step it) { functionName(newArrayList('effect', elementName, reaction.name)) }
-	 
-	def asEntryActionFunction(Step it) { functionName('entryAction') }
-	
-	def asExitActionFunction(Step it) { functionName('exitAction') }
-	 
-	def asEnterSequenceFunction(Step it) { functionName('enterSequence') }
-		 
-	def asDeepEnterSequenceFunction(Step it) { functionName('deepEnterSequence') }
-	 
-	def asShallowEnterSequenceFunction(Step it) { functionName('shallowEnterSequence') }
-	 
-	def asExitSequenceFunction(Step it) { functionName('exitSequence') }
-	 
-	def asReactFunction(Step it) { functionName('react') }
-	
-	def functionName(Step it, String fName) { functionName(newArrayList(fName, elementName)) }
-	
-	//Changed compared to c
-	def functionName(EObject it, List<String> segments) {
-		segments.fold("", [s, seg | s + if (seg.empty) "" else seg.toFirstUpper]).asIdentifier
-	}
-	
-	def dispatch String elementName(EObject it) { eContainer.elementName }
-	
-	def dispatch String elementName(ExecutionScope it) { (if (superScope != null && ! superScope.elementName.empty) superScope.elementName + "_" else "") + name }	
-	
-	def dispatch String elementName(ExecutionState it) { (if (superScope != null && ! superScope.elementName.empty) superScope.elementName + "_" else "") + simpleName }	
-	
-	def dispatch String elementName(ExecutionNode it) { name }	
 	
-	def dispatch String elementName(ExecutionFlow it) { "" }
 }

+ 1 - 1
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Statemachine.xtend

@@ -547,7 +547,7 @@ class Statemachine {
 	
 	def dispatch functionImplementation(Check it) '''
 		«stepComment»
-		private boolean «asCheckFunction»() {
+		private boolean «functionName»() {
 			return «code»;
 		}
 		

+ 30 - 10
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/DefaultNamingService.xtend

@@ -1,3 +1,16 @@
+/**
+  Copyright (c) 2014-2015 committers of YAKINDU Statechart Tools.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  	Markus Mühlbrandt - Initial contribution and API
+  	Axel Terfloth - Extensions
+*/
+
+
 package org.yakindu.sct.model.sexec.naming
 
 import java.util.Comparator
@@ -49,6 +62,11 @@ enum NameShorteningStrategy {
 	INDEX_POSITION
 }
 
+
+/** Default implementation of the naming service for various identifiers used in the generated code. 
+ * It is responsible for identifier construction depending on the thing to be named including different strategies 
+ * which also include name shortening.
+ */
 class DefaultNamingService implements INamingService {
 
 	@Inject extension SExecExtensions
@@ -303,7 +321,7 @@ class DefaultNamingService implements INamingService {
 
 		var name = element.elementName(nameShorteningType)
 
-		if (name.nullOrEmpty) {
+		if (name.nullOrEmpty && prefix.nullOrEmpty && suffix.nullOrEmpty) {
 			name = element.class.simpleName
 		}
 
@@ -316,15 +334,17 @@ class DefaultNamingService implements INamingService {
 			}
 		}
 
-		var shortName = prefix
-		if (!name.nullOrEmpty) {
-			if (prefix.nullOrEmpty) {
-				shortName = name.asEscapedIdentifier
+		if (! prefix.nullOrEmpty) {
+			if ( ! name.nullOrEmpty ) {
+				name = prefix + separator + name
 			} else {
-				shortName = (prefix + separator + name).asEscapedIdentifier
+				name = prefix
 			}
+			
 		}
-
+				
+		var shortName = name.asEscapedIdentifier
+		
 		if (nameList.containsName(shortName)) {
 			switch element {
 				ExecutionScope:
@@ -351,7 +371,7 @@ class DefaultNamingService implements INamingService {
 
 	def protected dispatch String elementName(NamedElement it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(1).
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(2).
 				toString(separator.toString)
 			case NameShorteningStrategy::SHORT_NAME: return name
 			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
@@ -371,8 +391,8 @@ class DefaultNamingService implements INamingService {
 
 	def protected dispatch String elementName(ExecutionState it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(2).
-				toString(separator.toString)
+			case NameShorteningStrategy::FQN_NAME: 
+				return provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
 			case NameShorteningStrategy::SHORT_NAME: return simpleName
 			case NameShorteningStrategy::REMOVE_VOWELS: return simpleName.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition

+ 22 - 13
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/INamingService.java

@@ -1,3 +1,14 @@
+/*
+  Copyright (c) 2014-2015 committers of YAKINDU Statechart Tools.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  	Markus Muelhbrand - Initial contribution
+ */
+
 package org.yakindu.sct.model.sexec.naming;
 
 import java.util.Map;
@@ -60,7 +71,7 @@ public interface INamingService {
 	 * @return
 	 */
 	String asIdentifier(String string);
-	
+
 	/**
 	 * If the given string equals a target language keyword it is escaped.
 	 * 
@@ -68,7 +79,7 @@ public interface INamingService {
 	 * @return
 	 */
 	String asEscapedIdentifier(String string);
-	
+
 	/**
 	 * Checks if the given string is a target language keyword
 	 * 
@@ -76,35 +87,33 @@ public interface INamingService {
 	 * @return
 	 */
 	boolean isKeyword(String string);
-	
+
 	/**
-	 * Sets the maximum length for shorted names. 
+	 * Sets the maximum length for shorted names.
 	 * 
 	 * @param int
 	 */
-	void setMaxLength (int length);
-	
+	void setMaxLength(int length);
+
 	/**
 	 * Sets the separator for shorted names.
 	 * 
 	 * @param char
 	 */
 	void setSeparator(char sep);
-	
-	
+
 	/**
 	 * Returns the maximum length of shorted names.
 	 * 
 	 * @return int
 	 */
 	int getMaxLength();
-	
+
 	/**
-	 * Returns the separator for shorted names. 
+	 * Returns the separator for shorted names.
 	 * 
-	 * @return char 
+	 * @return char
 	 */
 	char getSeparator();
-	
-	
+
 }

+ 2 - 1
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecElementMapping.xtend

@@ -62,7 +62,6 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 	@Inject extension IQualifiedNameProvider qfnProvider
 	@Inject extension StatechartExtensions sce
 	@Inject extension SgraphExtensions sgraph
-	@Inject extension StextExtensions stext
 	@Inject extension SexecExtensions sexec
 	
 
@@ -193,6 +192,7 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 			} else {
 				r.name =  region.name
 			}
+			r.name= region.fullyQualifiedName.toString.replaceAll(" ", "")
 			r.sourceElement = region
 		}
 	}
@@ -227,6 +227,7 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 	} 
 
 	def Call newCall(Step step) {
+//	  if (step ==  null) throw new IllegalArgumentException("Attempt to create 'null' call.")
 		val r = sexecFactory.createCall
 		r.step = step
 		r

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/AlwaysOncycle/AlwaysOncycle.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/AssignmentAsExpression/AssignmentAsExpression.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/BitExpressions/BitExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/BooleanExpressions/BooleanExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/CKeywords/CKeywords.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/CastExpressions/CastExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/Choice/Choice.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ConditionalExpression/ConditionalExpression.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ConstantsTests/ConstantsTests.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/Declarations/Declarations.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepEntry/DeepEntry.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepHistory/DeepHistory.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/DynamicChoice/DynamicChoice.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/EnterState/EnterState.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryChoice/EntryChoice.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryExitSelfTransition/EntryExitSelfTransition.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitOnSelfTransition/ExitOnSelfTransition.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitState/ExitState.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/FeatureCalls/FeatureCalls.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/Guard/Guard.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedEntry/GuardedEntry.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedExit/GuardedExit.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithExitPoint/HistoryWithExitPoint.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithoutInitialStep/HistoryWithoutInitialStep.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/InEventLifeCycle/InEventLifeCycle.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/IntegerExpressions/IntegerExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/InternalEventLifeCycle/InternalEventLifeCycle.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/LocalReactions/LocalReactions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalAndTests/LogicalAndTests.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalOrTests/LogicalOrTests.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/NamedInterfaceAccess/NamedInterfaceAccess.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/NullCheck/NullCheck.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/OutEventLifeCycle/OutEventLifeCycle.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/Parenthesis/Parenthesis.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/PriorityValues/PriorityValues.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/RaiseEvent/RaiseEvent.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/STextKeywordsInStatesAndRegions/STextKeywordsInStatesAndRegions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SameNameDifferentRegion/SameNameDifferentRegion.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistory/ShallowHistory.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistoryWithDeepEntry/ShallowHistoryWithDeepEntry.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleEvent/SimpleEvent.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleHierachy/SimpleHierachy.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/StateIsActive/StateIsActive.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartLocalReactions/StatechartLocalReactions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/StaticChoice/StaticChoice.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncFork/SyncFork.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncJoin/SyncJoin.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/TimedTransitions/TimedTransitions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/TransitionWithoutCondition/TransitionWithoutCondition.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/TriggerGuardExpressions/TriggerGuardExpressions.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/ValuedEvents/ValuedEvents.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AlwaysOncycle.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AssignmentAsExpression.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/BitExpressions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/BooleanExpressions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/CKeywords.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/CastExpressions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Choice.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ConditionalExpression.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ConstantsTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Declarations.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DeepEntry.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DeepHistory.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/DynamicChoice.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EnterState.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EntryChoice.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/EntryExitSelfTransition.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ExitOnSelfTransition.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ExitState.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/FeatureCalls.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Guard.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/GuardedEntry.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/GuardedExit.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/HistoryWithExitPoint.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/HistoryWithoutInitialStep.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/InEventLifeCycle.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/IntegerExpressions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/InternalEventLifeCycle.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LocalReactions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LogicalAndTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/LogicalOrTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/NamedInterfaceAccess.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/NullCheck.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/OutEventLifeCycle.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/Parenthesis.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/PriorityValues.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/RaiseEvent.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/STextKeywordsInStatesAndRegions.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/SameNameDifferentRegion.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 committers of YAKINDU and others.
+ * Copyright (c) 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at

+ 0 - 0
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/ShallowHistory.java


Некоторые файлы не были показаны из-за большого количества измененных файлов