You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/09/19 21:21:48 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/task WorkflowInvoker.java
andreas 2003/09/19 12:21:48
Modified: src/java/org/apache/lenya/cms/task WorkflowInvoker.java
Log:
changed constructor to static extractParameters method
Revision Changes Path
1.2 +17 -13 cocoon-lenya/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java
Index: WorkflowInvoker.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowInvoker.java 25 Aug 2003 15:40:55 -0000 1.1
+++ WorkflowInvoker.java 19 Sep 2003 19:21:48 -0000 1.2
@@ -66,6 +66,7 @@
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.workflow.WorkflowFactory;
+import org.apache.lenya.util.NamespaceMap;
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowInstance;
@@ -91,18 +92,19 @@
/**
* Ctor.
- * @param parameters A map containing the prefixed parameters.
* @param eventName The event name.
* @param identity The identity.
* @param roles The roles.
+ * @return A namespace map containing the parameters.
*/
- public WorkflowInvoker(Map parameters, String eventName, Identity identity, Role[] roles) {
- this(parameters);
- log.debug("Creating workflow invoker.");
+ public static NamespaceMap extractParameters(String eventName, Identity identity, Role[] roles) {
+ NamespaceMap parameters = new NamespaceMap(PREFIX);
+ log.debug("Extractign workflow invoker parameters.");
log.debug(" Event: [" + eventName + "]");
- put(EVENT, eventName);
- setRoles(roles);
- setIdentity(identity);
+ parameters.put(EVENT, eventName);
+ setRoles(parameters, roles);
+ setIdentity(parameters, identity);
+ return parameters;
}
/**
@@ -125,9 +127,10 @@
/**
* Sets the roles.
+ * @param parameters A workflow invoker namespace map.
* @param roles A role array.
*/
- public void setRoles(Role[] roles) {
+ public static void setRoles(NamespaceMap parameters, Role[] roles) {
String roleString = "";
for (int i = 0; i < roles.length; i++) {
@@ -136,28 +139,29 @@
}
roleString += roles[i].getId();
}
- put(ROLES, roleString);
+ parameters.put(ROLES, roleString);
}
/**
* Sets the identity.
+ * @param parameters A workflow invoker namespace map.
* @param identity An identity.
*/
- public void setIdentity(Identity identity) {
+ public static void setIdentity(NamespaceMap parameters, Identity identity) {
String userId = "";
User user = identity.getUser();
if (user != null) {
userId = user.getId();
}
- put(USER_ID, userId);
+ parameters.put(USER_ID, userId);
String machineIp = "";
Machine machine = identity.getMachine();
if (machine != null) {
machineIp = machine.getIp();
}
- put(MACHINE, machineIp);
+ parameters.put(MACHINE, machineIp);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org