[jbpm-commits] JBoss JBPM SVN: r1566 - in jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration: model and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jul 10 05:00:27 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-10 05:00:27 -0400 (Thu, 10 Jul 2008)
New Revision: 1566
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/SignalManagerImpl.java
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/ProcessImpl.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:
Use JAXB for API model
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/SignalManagerImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/SignalManagerImpl.java 2008-07-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/SignalManagerImpl.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -25,7 +25,7 @@
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.runtime.Signal;
+import org.jboss.bpm.model.Signal;
/**
* An implementation of a signal manager
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-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -23,9 +23,8 @@
//$Id$
+import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.AbstractEndEvent;
-import org.jboss.bpm.runtime.Token;
import org.jbpm.graph.def.Node;
/**
@@ -34,17 +33,11 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class EndEventImpl extends AbstractEndEvent
+public class EndEventImpl extends EndEvent
{
EndEventImpl(Process proc, Node oldNode)
{
setProcess(proc);
setImplObject(oldNode);
}
-
- @Override
- protected void executeOverwrite(Token token)
- {
- // nothing to do
- }
}
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-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessAdapter.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -26,10 +26,9 @@
import java.util.List;
import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.internal.AbstractFlowObject;
-import org.jboss.bpm.runtime.BasicTask;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
@@ -52,7 +51,7 @@
List<org.jbpm.graph.def.Node> oldNodes = oldPD.getNodes();
for (org.jbpm.graph.def.Node oldNode : oldNodes)
{
- AbstractFlowObject flowObject = NodeAdapter.adaptNode(apiProc, oldNode);
+ FlowObject flowObject = NodeAdapter.adaptNode(apiProc, oldNode);
apiProc.addFlowObject(flowObject);
}
@@ -71,9 +70,9 @@
static class NodeAdapter
{
- static AbstractFlowObject adaptNode(Process apiProc, Node oldNode)
+ static FlowObject adaptNode(Process apiProc, Node oldNode)
{
- AbstractFlowObject flowObject;
+ FlowObject flowObject;
if (oldNode instanceof StartState)
{
flowObject = new StartEventImpl(apiProc, oldNode);
@@ -102,11 +101,10 @@
delegate = (Task)obj;
}
flowObject = new TaskImpl(apiProc, oldNode, delegate);
- if (delegate instanceof BasicTask)
+ if (delegate != null)
{
- BasicTask basic = (BasicTask)delegate;
- basic.setProcess(apiProc);
- basic.setName(oldNode.getName());
+ delegate.setProcess(apiProc);
+ delegate.setName(oldNode.getName());
}
}
else
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-07-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -25,8 +25,6 @@
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.AbstractFlowObject;
-import org.jboss.bpm.model.internal.AbstractProcess;
import org.jboss.bpm.runtime.Token;
import org.jbpm.graph.def.GraphElement;
import org.jbpm.graph.def.ProcessDefinition;
@@ -38,7 +36,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class ProcessImpl extends AbstractProcess
+public class ProcessImpl extends Process
{
public ProcessImpl(ProcessDefinition oldPD)
{
@@ -47,7 +45,7 @@
}
// Provide public access
- public void addFlowObject(AbstractFlowObject flowObject)
+ public void addFlowObject(FlowObject flowObject)
{
super.addFlowObject(flowObject);
}
@@ -57,7 +55,7 @@
FlowObject fo = null;
for (FlowObject aux : getFlowObjects())
{
- if (((AbstractFlowObject)aux).getImplObject() == graphElement)
+ if (((FlowObject)aux).getImplObject() == graphElement)
{
fo = aux;
break;
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-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.AbstractStartEvent;
+import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.runtime.Token;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.GraphElement;
@@ -38,7 +38,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class StartEventImpl extends AbstractStartEvent
+public class StartEventImpl extends StartEvent
{
private Execution oldEx;
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-10 09:00:19 UTC (rev 1565)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-07-10 09:00:27 UTC (rev 1566)
@@ -25,7 +25,6 @@
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Task;
-import org.jboss.bpm.model.internal.AbstractTask;
import org.jboss.bpm.runtime.Token;
import org.jbpm.graph.def.GraphElement;
import org.jbpm.graph.def.Node;
@@ -36,7 +35,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class TaskImpl extends AbstractTask
+public class TaskImpl extends Task
{
private Task delegate;
@@ -72,10 +71,4 @@
super.execute(token);
}
}
-
- @Override
- protected void executeOverwrite(Token token)
- {
- // nothing to do
- }
}
More information about the jbpm-commits
mailing list