[jbpm-commits] JBoss JBPM SVN: r1900 - in jbossbpm/spec/trunk/modules: ri/src/main/java/org/jboss/bpm/client/internal and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 15 06:47:28 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-08-15 06:47:27 -0400 (Fri, 15 Aug 2008)
New Revision: 1900
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
Log:
Refactor SignalHandler
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -39,10 +39,10 @@
/**
* Get signal for enter
*/
- Signal getEnterSignal();
+ void throwEnterSignal();
/**
* Get signal for exit
*/
- Signal getExitSignal();
+ void throwExitSignal();
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -25,7 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Process.ProcessStatus;
@@ -66,7 +65,6 @@
public void run()
{
- SignalManager signalManager = SignalManager.locateSignalManager();
TokenExecutor tokenExecutor = rtProc.getTokenExecutor();
ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
@@ -94,7 +92,7 @@
try
{
// Execute the FlowObject
- signalManager.throwSignal(procImpl.getName(), sigHandler.getEnterSignal());
+ sigHandler.throwEnterSignal();
target.execute(token);
// Transfer the token to the FlowHandler
@@ -108,7 +106,7 @@
}
finally
{
- signalManager.throwSignal(procImpl.getName(), sigHandler.getExitSignal());
+ sigHandler.throwExitSignal();
}
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.EventDetail;
@@ -101,14 +102,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -29,13 +29,13 @@
import java.util.List;
import java.util.Map;
+import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.Gateway;
import org.jboss.bpm.model.SequenceFlow;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.model.Signal.SignalType;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.SignalHandler;
import org.jboss.bpm.runtime.Token;
@@ -148,14 +148,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal(getName(), SignalType.SYSTEM_GATEWAY_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_GATEWAY_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal(getName(), SignalType.SYSTEM_GATEWAY_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_GATEWAY_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -23,6 +23,7 @@
//$Id$
+import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.ConnectingObject;
import org.jboss.bpm.model.IntermediateEvent;
import org.jboss.bpm.model.Signal;
@@ -93,14 +94,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_EVENT_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -118,14 +118,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal("Start", Signal.SignalType.SYSTEM_START_EVENT_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_START_EVENT_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal("Start", Signal.SignalType.SYSTEM_START_EVENT_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_START_EVENT_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -23,6 +23,7 @@
//$Id$
+import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.SubProcess;
import org.jboss.bpm.runtime.SignalHandler;
@@ -53,14 +54,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_SUB_PROCESS_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-15 10:09:45 UTC (rev 1899)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-15 10:47:27 UTC (rev 1900)
@@ -21,6 +21,7 @@
*/
package org.jboss.bpm.model.internal;
+import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
@@ -61,14 +62,17 @@
{
handler = new SignalHandler()
{
- public Signal getEnterSignal()
+ SignalManager signalManager = SignalManager.locateSignalManager();
+ public void throwEnterSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_TASK_ENTER);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_TASK_ENTER);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
- public Signal getExitSignal()
+ public void throwExitSignal()
{
- return new Signal(getName(), Signal.SignalType.SYSTEM_TASK_EXIT);
+ Signal signal = new Signal(getName(), Signal.SignalType.SYSTEM_TASK_EXIT);
+ signalManager.throwSignal(getProcess().getName(), signal);
}
};
}
More information about the jbpm-commits
mailing list