Update of /cvsroot/metamorphosis/krysalis-sandbox/workflow/src/java/org/krysalis/workflow/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv10961/workflow/src/java/org/krysalis/workflow/manager
Modified Files:
DefaultWorkFlow.java DefaultWorkFlowManager.java
Log Message:
First tests of the event processing.
Index: DefaultWorkFlow.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-sandbox/workflow/src/java/org/krysalis/workflow/manager/DefaultWorkFlow.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultWorkFlow.java 14 Mar 2003 18:58:30 -0000 1.3
--- DefaultWorkFlow.java 15 Mar 2003 18:44:37 -0000 1.4
***************
*** 29,33 ****
*/
public class DefaultWorkFlow extends AbstractLogEnabled
! implements WorkFlow, Configurable /* , Disposable */
{
--- 29,33 ----
*/
public class DefaultWorkFlow extends AbstractLogEnabled
! implements WorkFlow, Configurable, Composable /* , Disposable */
{
***************
*** 83,90 ****
this.stateNames[i] = states[i].getAttribute("name");
- System.out.println("initial="+configuration.getAttribute("inital", states[0].getAttribute("name")));
-
initialState = indexOfState(configuration.getAttribute("inital", states[0].getAttribute("name")));
- System.out.println("initialState="+initialState);
this.transitions = new int[states.length][];
--- 83,87 ----
***************
*** 123,132 ****
try
{
! this.transitionConditions[state][transition] = (WorkFlowCondition) this.manager.lookup(condition.getAttribute("name"));
}
catch (ComponentException ce)
{
throw new ConfigurationException("Could not retrieve condition '"+
! condition.getAttribute("name")+
"'", ce);
}
--- 120,130 ----
try
{
! this.transitionConditions[state][transition] = (WorkFlowCondition)
! this.manager.lookup(condition.getAttribute("type"));
}
catch (ComponentException ce)
{
throw new ConfigurationException("Could not retrieve condition '"+
! condition.getAttribute("type")+
"'", ce);
}
***************
*** 146,155 ****
try
{
! this.transitionActions[state][transition][action] = (WorkFlowAction) this.manager.lookup(actions[action].getAttribute("name"));
}
catch (ComponentException ce)
{
throw new ConfigurationException("Could not retrieve action '"+
! actions[action].getAttribute("name")+
"'", ce);
}
--- 144,157 ----
try
{
! /* getLogger().debug("action="+action+" length="+this.transitionActions[state][transition].length);
! getLogger().debug("type="+actions[action].getAttribute("type"));
! getLogger().debug("action="+this.transitionActions[state][transition][action]);*/
! this.transitionActions[state][transition][action] = (WorkFlowAction)
! this.manager.lookup(actions[action].getAttribute("type"));
}
catch (ComponentException ce)
{
throw new ConfigurationException("Could not retrieve action '"+
! actions[action].getAttribute("type")+
"'", ce);
}
***************
*** 188,193 ****
throw new NullPointerException("State is null");
- System.out.println(stateNames.length+" , "+initialState);
-
if (currentState.getState()==null)
currentState.setState(stateNames[initialState]);
--- 190,193 ----
***************
*** 257,269 ****
{
changed = false;
! for (transition = 0; transition<transitionEvents[state].length;
! transition++)
!
! //System.out.println("transition="+transition+" , "+transitionEvents[state].length);
! //System.out.println(transition<transitionEvents[state].length);
!
if ((transitionEvents[state][transition]==null) &&
! transitionConditions[state][transition].evaluate(currentState,
! null, transitionConditionParameters[state][transition]))
{
state = transitions[state][transition];
--- 257,266 ----
{
changed = false;
! for (transition = 0; transition<transitionEvents[state].length; transition++)
! {
if ((transitionEvents[state][transition]==null) &&
! ((transitionConditions[state][transition]==null) ||
! transitionConditions[state][transition].evaluate(currentState,
! null, transitionConditionParameters[state][transition])))
{
state = transitions[state][transition];
***************
*** 286,290 ****
break;
}
!
}
while (changed);
--- 283,287 ----
break;
}
! }
}
while (changed);
Index: DefaultWorkFlowManager.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-sandbox/workflow/src/java/org/krysalis/workflow/manager/DefaultWorkFlowManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultWorkFlowManager.java 14 Mar 2003 18:58:30 -0000 1.3
--- DefaultWorkFlowManager.java 15 Mar 2003 18:44:37 -0000 1.4
***************
*** 190,194 ****
* @param event
*/
! public void process(String resource, WorkFlowEvent event)
{
WorkFlowMapper mapper = null;
--- 190,194 ----
* @param event
*/
! public void process(WorkFlowEvent event)
{
WorkFlowMapper mapper = null;
***************
*** 204,217 ****
mapper = (WorkFlowMapper) cm.lookup(WorkFlowMapper.ROLE);
storeselector = (ComponentSelector) cm.lookup(WorkFlowStore.ROLE+
"Selector");
! store = (WorkFlowStore) storeselector.select(mapper.getWorkFlowStore(resource));
! state = store.lookup(resource);
// Process event
workflowselector = (ComponentSelector) cm.lookup(WorkFlow.ROLE+
"Selector");
! workflow = (WorkFlow) workflowselector.select(mapper.getWorkFlow(resource));
workflow.process(state, event);
--- 204,221 ----
mapper = (WorkFlowMapper) cm.lookup(WorkFlowMapper.ROLE);
+ // If not workflow is assigned
+ if (mapper.getWorkFlow(event.getResource())==null)
+ return;
+
storeselector = (ComponentSelector) cm.lookup(WorkFlowStore.ROLE+
"Selector");
! store = (WorkFlowStore) storeselector.select(mapper.getWorkFlowStore(event.getResource()));
! state = store.lookup(event.getResource());
// Process event
workflowselector = (ComponentSelector) cm.lookup(WorkFlow.ROLE+
"Selector");
! workflow = (WorkFlow) workflowselector.select(mapper.getWorkFlow(event.getResource()));
workflow.process(state, event);
***************
*** 262,265 ****
--- 266,273 ----
// Retrieve workflow state
mapper = (WorkFlowMapper) cm.lookup(WorkFlowMapper.ROLE);
+
+ // If not workflow is assigned
+ if (mapper.getWorkFlow(resource)==null)
+ return null;
storeselector = (ComponentSelector) cm.lookup(WorkFlowStore.ROLE+
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.