added gateway type to dsl

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

@@ -84,7 +84,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" 
@@ -272,8 +273,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 {
 
@@ -31,7 +32,7 @@ public class Main {
 				Arrays.asList("wup.html")); //
 		
 		FlowElement start = TestgeneratorDSLObjectCreator.createStartFlowElement("Start_123", Arrays.asList(), null);
-		FlowElement gateway = TestgeneratorDSLObjectCreator.createGatewayFlowElement("Gateway_123");
+		FlowElement gateway = TestgeneratorDSLObjectCreator.createGatewayFlowElement("Gateway_123", GatewayType.PARALLEL);
 		FlowElement activity = TestgeneratorDSLObjectCreator.createUserTaskFlowElement("Activity_123", Arrays.asList(), Arrays.asList(), "Activity 123", null);
 		FlowElement end = TestgeneratorDSLObjectCreator.createEndFlowElement("End_123");
 		FlowElement activity2 = TestgeneratorDSLObjectCreator.createServiceTaskFlowElement("Activity_234");