[jbpm-commits] JBoss JBPM SVN: r3949 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml.

[do-not-reply at jboss.org]

Author: mputz
Date: 2009-02-19 08:55:13 -0500 (Thu, 19 Feb 2009)
New Revision: 3949

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
Log:
JBPM-2051 - Incorrect WARN messages for swimlanes

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2009-02-19 13:08:17 UTC (rev 3948)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2009-02-19 13:55:13 UTC (rev 3949)
@@ -240,14 +240,6 @@
             swimlane.setAssignmentDelegation(assignmentDelegation);
           }
         }
-        else
-        {
-          Task startTask = taskMgmtDefinition.getStartTask();
-          if ((startTask == null) || (startTask.getSwimlane() != swimlane))
-          {
-            addWarning("swimlane '" + swimlaneName + "' does not have an assignment");
-          }
-        }
         taskMgmtDefinition.addSwimlane(swimlane);
       }
     }
@@ -995,7 +987,10 @@
         Task startTask = taskMgmtDefinition.getStartTask();
         Swimlane startTaskSwimlane = (startTask != null ? startTask.getSwimlane() : null);
 
-        if ((swimlane.getAssignmentDelegation() == null) && (swimlane != startTaskSwimlane))
+        if ((swimlane.getAssignmentDelegation() == null) 
+             && (swimlane.getActorIdExpression()==null)
+             && (swimlane.getPooledActorsExpression()==null)
+             && (swimlane != startTaskSwimlane))
         {
           addWarning("swimlane '" + swimlane.getName() + "' does not have an assignment");
         }