round-tripping version and taskName attributes

tsurdilo · Feb 22, 2011 · 2bf4744 · 2bf4744
1 parent b5ac7f6
commit 2bf4744
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/src/main/java/com/intalio/bpmn2/impl/Bpmn2JsonMarshaller.java b/src/main/java/com/intalio/bpmn2/impl/Bpmn2JsonMarshaller.java
@@ -203,15 +203,19 @@ private void marshallDefinitions(Definitions def, JsonGenerator generator) throw
 	                props.put("executable", ((Process) rootElement).isIsExecutable() + "");
 	                props.put("id", ((Process) rootElement).getId());
 
-	                // packageName is a jbpm-specific extension attribute
+	                // packageName and version are jbpm-specific extension attribute
 	                Iterator<FeatureMap.Entry> iter = ((Process) rootElement).getAnyAttribute().iterator();
 	                while(iter.hasNext()) {
 	                    FeatureMap.Entry entry = iter.next();
 	                    if(entry.getEStructuralFeature().getName().equals("packageName")) {
 	                        props.put("package", entry.getValue());
-	                        break;
 	                    }
+
+	                    if(entry.getEStructuralFeature().getName().equals("version")) {
+                            props.put("version", entry.getValue());
+                        }
 	                }
+
 	                marshallProperties(props, generator);
 	                marshallStencil("BPMNDiagram", generator);
 	            	linkSequenceFlows(((Process) rootElement).getFlowElements());
@@ -460,12 +464,15 @@ private void marshallTask(Task task, BPMNPlane plane, JsonGenerator generator, i
     	}
 
     	properties.put("tasktype", taskType);
-    	// get out the droolsjbpm-specific attribute "ruleflowGroup"
+    	// get out the droolsjbpm-specific attributes "ruleflowGroup" and "taskName"
     	Iterator<FeatureMap.Entry> iter = task.getAnyAttribute().iterator();
         while(iter.hasNext()) {
             FeatureMap.Entry entry = iter.next();
             if(entry.getEStructuralFeature().getName().equals("ruleFlowGroup")) {
                 properties.put("ruleflowgroup", entry.getValue());
+            }
+            if(entry.getEStructuralFeature().getName().equals("taskName")) {
+                properties.put("taskname", entry.getValue());
                 break;
             }
         }

diff --git a/src/main/java/com/intalio/bpmn2/impl/Bpmn2JsonUnmarshaller.java b/src/main/java/com/intalio/bpmn2/impl/Bpmn2JsonUnmarshaller.java
@@ -709,6 +709,16 @@ private void applyProcessProperties(Process process, Map<String, String> propert
             process.getAnyAttribute().add(extensionEntry);
         }
 
+        // add version attrbute to process
+        if(properties.get("version") != null && properties.get("version").length() > 0) {
+            ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
+            EAttributeImpl extensionAttribute = (EAttributeImpl) metadata.demandFeature(
+                        "http://www.jboss.org/drools", "version", false, false);
+            EStructuralFeatureImpl.SimpleFeatureMapEntry extensionEntry = new EStructuralFeatureImpl.SimpleFeatureMapEntry(extensionAttribute,
+                properties.get("version"));
+            process.getAnyAttribute().add(extensionEntry);
+        }
+
         if (properties.get("monitoring") != null && !"".equals(properties.get("monitoring"))) {
             Monitoring monitoring = Bpmn2Factory.eINSTANCE.createMonitoring();
             monitoring.getDocumentation().add(createDocumentation(properties.get("monitoring")));
@@ -741,6 +751,16 @@ private void applyLaneProperties(Lane lane, Map<String, String> properties) {
 
     private void applyTaskProperties(Task task, Map<String, String> properties) {
         task.setName(properties.get("name"));
+
+        if(properties.get("taskname") != null &&  properties.get("taskname").length() > 0) {
+            // add droolsjbpm-specific attribute "taskName"
+            ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
+            EAttributeImpl extensionAttribute = (EAttributeImpl) metadata.demandFeature(
+                    "http://www.jboss.org/drools", "taskName", false, false);
+            EStructuralFeatureImpl.SimpleFeatureMapEntry extensionEntry = new EStructuralFeatureImpl.SimpleFeatureMapEntry(extensionAttribute,
+                    properties.get("taskname"));
+            task.getAnyAttribute().add(extensionEntry);
+        }
     }
 
     private void applyGatewayProperties(Gateway gateway, Map<String, String> properties) {

diff --git a/src/main/webapp/stencilsets/bpmn2.0drools/bpmn2.0drools.json b/src/main/webapp/stencilsets/bpmn2.0drools/bpmn2.0drools.json
@@ -2323,6 +2323,16 @@
 					"description":"ruleFlowGroup",
 					"readonly":false,
 					"optional":true
+				},
+				{
+					"id":"taskName",
+					"type":"String",
+					"title":"Task Name",
+					"title_de":"Task Name",
+					"value":"",
+					"description":"Task Name",
+					"readonly":false,
+					"optional":true
 				}
 			]
 		},