[jbosstools-commits] JBoss Tools SVN: r23001 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: model and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2010-06-24 12:13:23 -0400 (Thu, 24 Jun 2010)
New Revision: 23001

Modified:
   trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AssignmentDeserializer.java
   trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HumanTaskSerializer.java
   trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java
   trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Assignment.java
Log:
GPD-376

Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AssignmentDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AssignmentDeserializer.java	2010-06-24 15:29:51 UTC (rev 23000)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AssignmentDeserializer.java	2010-06-24 16:13:23 UTC (rev 23001)
@@ -28,6 +28,14 @@
 			wrapper.setPropertyValue(Assignment.ASSIGNMENT_EXPRESSION, candidateGroups);
 			return;
 		}
+		String candidateUsers = element.getAttribute(Assignment.CANDIDATE_USERS);
+		if (!"".equals(candidateUsers)) {
+			wrapper.setPropertyValue(
+					Assignment.ASSIGNMENT_TYPE, 
+					AssignmentPropertySource.getAssignmentTypesIndex(Assignment.CANDIDATE_USERS));
+			wrapper.setPropertyValue(Assignment.ASSIGNMENT_EXPRESSION, candidateUsers);
+			return;
+		}
 		String swimlane = element.getAttribute(HumanTask.SWIMLANE);
 		if (!"".equals(swimlane)) {
 			wrapper.setPropertyValue(

Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HumanTaskSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HumanTaskSerializer.java	2010-06-24 15:29:51 UTC (rev 23000)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HumanTaskSerializer.java	2010-06-24 16:13:23 UTC (rev 23001)
@@ -16,6 +16,7 @@
 		List<String> result = super.getAttributesToSave();
 		result.add(Assignment.ASSIGNEE);
 		result.add(Assignment.CANDIDATE_GROUPS);
+		result.add(Assignment.CANDIDATE_USERS);
 		result.add(Assignment.SWIMLANE);
 		return result;
 	}
@@ -27,6 +28,8 @@
 			appendExpression(HumanTask.ASSIGNEE, buffer, wrapper);
 		} else if (HumanTask.CANDIDATE_GROUPS.equals(attributeName)) {
 			appendExpression(HumanTask.CANDIDATE_GROUPS, buffer, wrapper);
+		} else if (HumanTask.CANDIDATE_USERS.equals(attributeName)) {
+			appendExpression(HumanTask.CANDIDATE_USERS, buffer, wrapper);
 		} else if (HumanTask.SWIMLANE.equals(attributeName)) {
 			appendExpression(HumanTask.SWIMLANE, buffer, wrapper);
 		} else {

Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java	2010-06-24 15:29:51 UTC (rev 23000)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java	2010-06-24 16:13:23 UTC (rev 23001)
@@ -19,6 +19,7 @@
 		result.add("name");
 		result.add(Assignment.ASSIGNEE);
 		result.add(Assignment.CANDIDATE_GROUPS);
+		result.add(Assignment.CANDIDATE_USERS);
 		result.add(Assignment.SWIMLANE);
 		return result;
 	}
@@ -29,6 +30,8 @@
 			appendExpression(Assignment.ASSIGNEE, buffer, wrapper);
 		} else if (Assignment.CANDIDATE_GROUPS.equals(attributeName)) {
 			appendExpression(Assignment.CANDIDATE_GROUPS, buffer, wrapper);
+		} else if (Assignment.CANDIDATE_USERS.equals(attributeName)) {
+			appendExpression(Assignment.CANDIDATE_USERS, buffer, wrapper);
 		} else if (Assignment.SWIMLANE.equals(attributeName)) {
 			appendExpression(Assignment.SWIMLANE, buffer, wrapper);
 		} else if ("name".equals(attributeName)){

Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Assignment.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Assignment.java	2010-06-24 15:29:51 UTC (rev 23000)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Assignment.java	2010-06-24 16:13:23 UTC (rev 23001)
@@ -10,9 +10,10 @@
 	
 	public final String ASSIGNEE = "assignee";
 	public final String CANDIDATE_GROUPS = "candidate-groups";
+	public final String CANDIDATE_USERS = "candidate-users";
 	public final String SWIMLANE = "swimlane";
 	public final String NONE = "none";
 	
-	public final String[] ASSIGNMENT_TYPES = { ASSIGNEE, CANDIDATE_GROUPS, SWIMLANE, NONE };
+	public final String[] ASSIGNMENT_TYPES = { ASSIGNEE, CANDIDATE_GROUPS, CANDIDATE_USERS, SWIMLANE, NONE };
 	
 }