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

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-07-11 09:11:10 -0400 (Fri, 11 Jul 2008)
New Revision: 1584

Modified:
   jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/EndEventImpl.java
   jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java
   jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/StartEventImpl.java
   jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/TaskImpl.java
Log:
Initialize FlowObject

Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/EndEventImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/EndEventImpl.java	2008-07-11 13:11:03 UTC (rev 1583)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/EndEventImpl.java	2008-07-11 13:11:10 UTC (rev 1584)
@@ -38,7 +38,6 @@
 {
   EndEventImpl(Process proc, Node oldNode)
   {
-    setProcess(proc);
     setImplObject(oldNode);
   }
 

Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java	2008-07-11 13:11:03 UTC (rev 1583)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java	2008-07-11 13:11:10 UTC (rev 1584)
@@ -90,11 +90,6 @@
           delegate = (Task)obj;
         }
         flowObject = new TaskImpl(apiProc, oldNode, delegate);
-        if (delegate != null)
-        {
-          delegate.setProcess(apiProc);
-          delegate.setName(oldNode.getName());
-        }
       }
       else
       {

Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/StartEventImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/StartEventImpl.java	2008-07-11 13:11:03 UTC (rev 1583)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/StartEventImpl.java	2008-07-11 13:11:10 UTC (rev 1584)
@@ -44,7 +44,6 @@
   
   StartEventImpl(Process proc, Node oldNode)
   {
-    setProcess(proc);
     setImplObject(oldNode);
   }
 

Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/TaskImpl.java	2008-07-11 13:11:03 UTC (rev 1583)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/TaskImpl.java	2008-07-11 13:11:10 UTC (rev 1584)
@@ -41,11 +41,20 @@
   
   TaskImpl(Process proc, Node oldNode, Task task)
   {
-    setProcess(proc);
     setImplObject(oldNode);
     this.delegate = task;
   }
 
+  protected void initialize(Process proc)
+  {
+    super.initialize(proc);
+    if (delegate != null)
+    {
+      delegate.setProcess(proc);
+      delegate.setName(getName());
+    }
+  }
+  
   public String getName()
   {
     GraphElement oldEl = (GraphElement)getImplObject();