cmailleux 2005/10/25 11:07:36 CEST
Modified files:
core/src/java/org/jahia/workflow/nstep NStepWorkflow.java
Log:
Correct use of trimmed workflow names to avoid removing of workflows just
added
Revision Changes Path
1.9 +9 -4
jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java.diff?r1=1.8&r2=1.9&f=h
Index: NStepWorkflow.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NStepWorkflow.java 20 Oct 2005 14:19:55 -0000 1.8
+++ NStepWorkflow.java 25 Oct 2005 09:07:36 -0000 1.9
@@ -37,12 +37,15 @@
* Date: 9 déc. 2004
* Time: 14:53:40
* @author [EMAIL PROTECTED]
- * @version $Id: NStepWorkflow.java,v 1.8 2005/10/20 14:19:55 cmailleux Exp $
+ * @version $Id: NStepWorkflow.java,v 1.9 2005/10/25 09:07:36 cmailleux Exp $
*
* Revision log :
* $Log: NStepWorkflow.java,v $
+ * Revision 1.9 2005/10/25 09:07:36 cmailleux
+ * Correct use of trimmed workflow names to avoid removing of workflows just
added
+ *
* Revision 1.8 2005/10/20 14:19:55 cmailleux
- * Correct flush of acl cache
+ * Correct flush of acl cache
* Add option to export site after last step of an nstep workflow
*
* Revision 1.7 2005/09/30 08:40:28 cmailleux
@@ -547,8 +550,10 @@
private void initializeWorkflows() throws JahiaException {
String workflowNamesList = properties.getProperty("workflowsName",
"");
String[] workflowNamesArray = workflowNamesList.split(",");
+ List workflowNames = new ArrayList(workflowNamesArray.length);
for (int i = 0; i < workflowNamesArray.length; i++) {
String workflowName = workflowNamesArray[i].trim();
+ workflowNames.add(workflowName);
org.jahia.workflow.nstep.model.Workflow workflow = null;
try {
workflow = workflowManager.getWorkflowByName(workflowName);
@@ -595,9 +600,8 @@
workflow.setSteps(steps);
workflowManager.saveWorkflow(workflow);
}
- List workflowList = workflowManager.getWorkflows();
- List workflowNames = Arrays.asList(workflowNamesArray);
- if (workflowNames.size() < workflowList.size()) {
+ List workflowList = workflowManager.getWorkflows();
+ if (workflowNames.size() != workflowList.size()) {
for (int i = 0; i < workflowList.size(); i++) {
org.jahia.workflow.nstep.model.Workflow workflow =
(org.jahia.workflow.nstep.model.Workflow) workflowList.get(
i);
