Resized Test_ParallelRegios statechart.

TestScenarios/GenModelJava.sgen

@@ -13,16 +13,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText = 
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	statechart Test_DeepHistory {
@@ -39,16 +40,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText = 
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	
@@ -66,16 +68,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText =
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	
@@ -93,16 +96,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText =
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	
@@ -120,16 +124,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText =
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	
@@ -147,16 +152,26 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText =
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
+		}
+		
+		feature FunctionInlining {
+			inlineChoices = true
+			inlineEnterSequences = true
+			inlineEntryActions = true
+			inlineExitActions = true
+			inlineExitSequences = true
+			inlineReactions = true
 		}
 	}
 	
@@ -174,16 +189,17 @@ GeneratorModel for yakindu::java {
 		}
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText = 
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 	
@@ -201,16 +217,17 @@ GeneratorModel for yakindu::java {
 		}	
 		
 		feature licenseHeader {
-			licenseText = "/**
- * Copyright (c) 2011 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */"
+			licenseText = 
+"
+Copyright (c) 2011 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
+http://www.eclipse.org/legal/epl-v10.html
+ 
+Contributors:
+	committers of YAKINDU - initial API and implementation
+"
 		}
 	}
 }

TestScenarios/TestModels/Test_ParallelRegions.sct

@@ -154,7 +154,7 @@
                           <styles xsi:type="notation:ShapeStyle" xmi:id="_FcuI4viZEeC4at_AzcYiGg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
                           <styles xsi:type="notation:FontStyle" xmi:id="_Fcuv8PiZEeC4at_AzcYiGg"/>
                           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_FcvXAfiZEeC4at_AzcYiGg"/>
-                          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Fcuv8fiZEeC4at_AzcYiGg" x="178" y="-9"/>
+                          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Fcuv8fiZEeC4at_AzcYiGg" x="177" y="2"/>
                         </children>
                         <children xmi:id="_QLsXkPiaEeC4at_AzcYiGg" type="Entry" element="_QLrwgPiaEeC4at_AzcYiGg">
                           <children xmi:id="_QLsXk_iaEeC4at_AzcYiGg" type="BorderItemLabelContainer">
@@ -166,7 +166,7 @@
                             <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QLsXlfiaEeC4at_AzcYiGg"/>
                           </children>
                           <styles xsi:type="notation:ShapeStyle" xmi:id="_QLsXkfiaEeC4at_AzcYiGg" fontName="Verdana" lineColor="4210752"/>
-                          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QLsXkviaEeC4at_AzcYiGg" x="25" y="8"/>
+                          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_QLsXkviaEeC4at_AzcYiGg" x="58" y="23"/>
                         </children>
                         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_DvdAtPiXEeC4at_AzcYiGg"/>
                       </children>
@@ -232,7 +232,7 @@
                   <styles xsi:type="notation:ShapeStyle" xmi:id="_I7PfMfiOEeCdY7qI3rL1gA" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
                   <styles xsi:type="notation:FontStyle" xmi:id="_I7PfMviOEeCdY7qI3rL1gA"/>
                   <styles xsi:type="notation:BooleanValueStyle" xmi:id="_I7RUYfiOEeCdY7qI3rL1gA"/>
-                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_I7PfM_iOEeCdY7qI3rL1gA" x="207" y="3" width="473" height="269"/>
+                  <layoutConstraint xsi:type="notation:Bounds" xmi:id="_I7PfM_iOEeCdY7qI3rL1gA" x="207" y="3" width="473" height="262"/>
                 </children>
                 <children xmi:id="_KLtBgPiOEeCdY7qI3rL1gA" type="Entry" element="_KLsacPiOEeCdY7qI3rL1gA">
                   <children xmi:id="_KLuPoPiOEeCdY7qI3rL1gA" type="BorderItemLabelContainer">
@@ -310,12 +310,12 @@
           <styles xsi:type="notation:ShapeStyle" xmi:id="_jGdrYPiNEeCdY7qI3rL1gA" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
           <styles xsi:type="notation:FontStyle" xmi:id="_jGdrYfiNEeCdY7qI3rL1gA"/>
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_jGhVwfiNEeCdY7qI3rL1gA"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jGdrYviNEeCdY7qI3rL1gA" x="20" y="121" width="730" height="507"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_jGdrYviNEeCdY7qI3rL1gA" x="20" y="121" width="765" height="508"/>
         </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dt0BgvZlEeCSetPXFd1ZUw"/>
       </children>
       <styles xsi:type="notation:ShapeStyle" xmi:id="_dtyzZPZlEeCSetPXFd1ZUw" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dt0Bg_ZlEeCSetPXFd1ZUw" x="220" y="10" width="777" height="671"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_dt0Bg_ZlEeCSetPXFd1ZUw" x="220" y="10" width="810" height="670"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_dt46B_ZlEeCSetPXFd1ZUw" type="StatechartText" fontName="Verdana" lineColor="4210752">
       <children xsi:type="notation:DecorationNode" xmi:id="_dt6IIPZlEeCSetPXFd1ZUw" type="StatechartName">
@@ -340,7 +340,7 @@
     <edges xmi:id="_l-XFkPiNEeCdY7qI3rL1gA" type="Transition" element="_l-UpUPiNEeCdY7qI3rL1gA" source="_dt12sPZlEeCSetPXFd1ZUw" target="_jGdEUPiNEeCdY7qI3rL1gA">
       <children xsi:type="notation:DecorationNode" xmi:id="_l-Y6wPiNEeCdY7qI3rL1gA" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_l-Y6wfiNEeCdY7qI3rL1gA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_l-Y6wviNEeCdY7qI3rL1gA" x="37" y="-9"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_l-Y6wviNEeCdY7qI3rL1gA" x="55" y="-19"/>
       </children>
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_l-XFkfiNEeCdY7qI3rL1gA" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_l-YTsPiNEeCdY7qI3rL1gA" fontName="Verdana"/>
@@ -473,7 +473,7 @@
     <edges xmi:id="_u_xzYDXxEeGVofhlERZOaA" type="Transition" element="_u_rFsDXxEeGVofhlERZOaA" source="_jGdEUPiNEeCdY7qI3rL1gA" target="_dt12sPZlEeCSetPXFd1ZUw">
       <children xsi:type="notation:DecorationNode" xmi:id="_u_xzZDXxEeGVofhlERZOaA" type="TransitionExpression">
         <styles xsi:type="notation:ShapeStyle" xmi:id="_u_xzZTXxEeGVofhlERZOaA"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_u_xzZjXxEeGVofhlERZOaA" y="10"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_u_xzZjXxEeGVofhlERZOaA" x="-13" y="16"/>
       </children>
       <styles xsi:type="notation:ConnectorStyle" xmi:id="_u_xzYTXxEeGVofhlERZOaA" lineColor="4210752"/>
       <styles xsi:type="notation:FontStyle" xmi:id="_u_xzYzXxEeGVofhlERZOaA" fontName="Verdana"/>