Merge branch 'master' of https://git.fh-muenster.de/fe/fe-bpmn-test-dsl

de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/TestgeneratorDSL.xtext

@@ -90,7 +90,8 @@ BusinessRuleTaskFlowElement:
 	DECLARATION_FINISHED;
 	
 GatewayFlowElement:
-	"FlowElement" name=ID ASSOCIATION "Gateway" DECLARATION_FINISHED;
+	"FlowElement" name=ID ASSOCIATION "Gateway"
+	"(" type=GatewayType ")" DECLARATION_FINISHED;
 	
 SequenceFlowElement:
 	"FlowElement" name=ID ASSOCIATION "SequenceFlow" 
@@ -278,8 +279,13 @@ enum Flag:
 	
 enum ValidationState:
 	REQUIRED = "REQUIRED" |
-	OPTIONAL = "OPTIONAL"
-;
+	OPTIONAL = "OPTIONAL";
+	
+enum GatewayType:
+	NONE = "NONE" |
+	OR = "OR" |
+	XOR = "XOR" |
+	PARALLEL = "PARALLEL";
 
 terminal LIST_OPEN : '[';
 terminal LIST_CLOSED : ']';

de.fhmuenster.masterthesis.textgeneratordsl/src/de/fhmuenster/masterthesis/serialization/Main.java

@@ -8,6 +8,7 @@ import java.util.List;
 import de.fhmuenster.masterthesis.testgeneratorDSL.BPMNDiagram;
 import de.fhmuenster.masterthesis.testgeneratorDSL.Flow;
 import de.fhmuenster.masterthesis.testgeneratorDSL.FlowElement;
+import de.fhmuenster.masterthesis.testgeneratorDSL.GatewayType;
 
 public class Main {