[jbpm-commits] JBoss JBPM SVN: r4537 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-10 10:48:00 -0400 (Fri, 10 Apr 2009) New Revision: 4537 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java Log: JBPM-1459 renamed Activity.getDefaultTransition to getDefaultOutgoingTransition Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -49,7 +49,7 @@ * </p> * * <p>One of the outgoing transitions can optionally be marked as - * {@link #getDefaultTransition() the default transition}. + * {@link #getDefaultOutgoingTransition() the default transition}. * </p> * * <p>Block structured process languages have composite activities that can be @@ -66,7 +66,7 @@ List<Transition> getOutgoingTransitions(); /** the default outgoing transition. */ - Transition getDefaultTransition(); + Transition getDefaultOutgoingTransition(); /** the first leaving transition with the given name or null of no * such leaving transition exists. If the multiple transitions have Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -63,7 +63,7 @@ } execution.setActivity(join, outgoingExecution); - Transition transition = join.getDefaultTransition(); + Transition transition = join.getDefaultOutgoingTransition(); execution.take(transition, outgoingExecution); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -42,7 +42,7 @@ protected ObjectReference<ActivityBehaviour> behaviourReference; protected List<TransitionImpl> outgoingTransitions; protected List<TransitionImpl> incomingTransitions; - protected TransitionImpl defaultTransition; + protected TransitionImpl defaultOutgoingTransition; protected ActivityImpl parentActivity; protected String type; @@ -91,9 +91,9 @@ addOutgoingTransition(transition); // if there is no default transition yet - if (defaultTransition==null) { + if (defaultOutgoingTransition==null) { // make this the default outgoing transition - defaultTransition = transition; + defaultOutgoingTransition = transition; } return transition; @@ -124,9 +124,9 @@ addOutgoingTransition(transition); // if there is no default transition yet - if (defaultTransition==null) { + if (defaultOutgoingTransition==null) { // make this the default outgoing transition - defaultTransition = transition; + defaultOutgoingTransition = transition; } return transition; @@ -206,8 +206,8 @@ /** searches for the default transition in this activity and then up the * parent chain. Returns null if no such transition is found. */ public TransitionImpl findDefaultTransition() { - if (defaultTransition!=null) { - return defaultTransition; + if (defaultOutgoingTransition!=null) { + return defaultOutgoingTransition; } if (parentActivity!=null) { return parentActivity.findDefaultTransition(); @@ -442,11 +442,11 @@ public void setName(String name) { this.name = name; } - public TransitionImpl getDefaultTransition() { - return defaultTransition; + public TransitionImpl getDefaultOutgoingTransition() { + return defaultOutgoingTransition; } - public void setDefaultTransition(TransitionImpl defaultTransition) { - this.defaultTransition = defaultTransition; + public void setDefaultOutgoingTransition(TransitionImpl defaultOutgoingTransition) { + this.defaultOutgoingTransition = defaultOutgoingTransition; } public ActivityImpl getParentActivity() { return parentActivity; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -412,7 +412,7 @@ /** @see Execution#takeDefaultTransition() */ public void takeDefaultTransition() { - TransitionImpl defaultTransition = getActivity().getDefaultTransition(); + TransitionImpl defaultTransition = getActivity().getDefaultOutgoingTransition(); if (defaultTransition==null) { throw new JbpmException("there is no default transition in "+getActivity()); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -49,7 +49,7 @@ } public void makeDefault() { - source.setDefaultTransition(this); + source.setDefaultOutgoingTransition(this); } public String toString() { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-10 14:22:24 UTC (rev 4536) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-10 14:48:00 UTC (rev 4537) @@ -75,7 +75,7 @@ } execution.setActivity(join, outgoingExecution); - Transition transition = join.getDefaultTransition(); + Transition transition = join.getDefaultOutgoingTransition(); execution.take(transition, outgoingExecution); } }