Return-Path: Delivered-To: apmail-cocoon-lenya-cvs-archive@cocoon.apache.org Received: (qmail 66105 invoked by uid 500); 30 May 2003 19:59:16 -0000 Mailing-List: contact lenya-cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: "Lenya CVS Mailing List" Delivered-To: mailing list lenya-cvs@cocoon.apache.org Received: (qmail 66093 invoked from network); 30 May 2003 19:59:16 -0000 Date: 30 May 2003 19:59:16 -0000 Message-ID: <20030530195916.81790.qmail@icarus.apache.org> From: andreas@apache.org To: cocoon-lenya-cvs@apache.org Subject: cvs commit: cocoon-lenya/src/java/org/apache/lenya/workflow/impl StateImpl.java EventImpl.java BooleanVariableInstanceImpl.java ActionImpl.java BooleanVariableImpl.java TransitionImpl.java ConditionFactory.java WorkflowBuilder.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N andreas 2003/05/30 12:59:16 Modified: src/java/org/apache/lenya/workflow/impl StateImpl.java EventImpl.java BooleanVariableInstanceImpl.java ActionImpl.java BooleanVariableImpl.java TransitionImpl.java ConditionFactory.java WorkflowBuilder.java Log: fixed some coding style problems Revision Changes Path 1.2 +3 -3 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/StateImpl.java Index: StateImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/StateImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StateImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ StateImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -15,9 +15,9 @@ public class StateImpl implements State { /** Creates a new instance of StateImpl */ - protected StateImpl(String id) { - assert id != null; - this.id = id; + protected StateImpl(String stateId) { + assert stateId != null; + id = stateId; } private String id; 1.2 +3 -3 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/EventImpl.java Index: EventImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/EventImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EventImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ EventImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -15,9 +15,9 @@ public class EventImpl implements Event { /** Creates a new instance of EventImpl */ - protected EventImpl(String id) { - assert id != null; - this.id = id; + protected EventImpl(String eventId) { + assert eventId != null; + id = eventId; } private String id; 1.2 +2 -2 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/BooleanVariableInstanceImpl.java Index: BooleanVariableInstanceImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/BooleanVariableInstanceImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BooleanVariableInstanceImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ BooleanVariableInstanceImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -30,8 +30,8 @@ /** * @see org.apache.lenya.cms.workflow.BooleanVariableInstance#setValue(boolean) */ - public void setValue(boolean value) { - this.value = value; + public void setValue(boolean variableValue) { + value = variableValue; } } 1.2 +3 -3 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/ActionImpl.java Index: ActionImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/ActionImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ActionImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ ActionImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -16,9 +16,9 @@ implements Action { /** Creates a new instance of ActionImpl */ - protected ActionImpl(String id) { - assert id != null; - this.id = id; + protected ActionImpl(String actionId) { + assert actionId != null; + id = actionId; } private String id; 1.2 +3 -3 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/BooleanVariableImpl.java Index: BooleanVariableImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/BooleanVariableImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BooleanVariableImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ BooleanVariableImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -15,9 +15,9 @@ public class BooleanVariableImpl implements BooleanVariable { /** Creates a new instance of BooleanVariableImpl */ - protected BooleanVariableImpl(String name) { - assert name != null; - this.name = name; + protected BooleanVariableImpl(String variableName) { + assert variableName != null; + name = variableName; } private String name; 1.2 +8 -8 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/TransitionImpl.java Index: TransitionImpl.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/TransitionImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TransitionImpl.java 30 May 2003 19:32:43 -0000 1.1 +++ TransitionImpl.java 30 May 2003 19:59:15 -0000 1.2 @@ -22,13 +22,13 @@ public class TransitionImpl implements Transition { /** Creates a new instance of TransitionImpl */ - protected TransitionImpl(State source, State destination) { + protected TransitionImpl(State sourceState, State destinationState) { - assert source != null; - assert destination != null; + assert sourceState != null; + assert destinationState != null; - this.source = source; - this.destination = destination; + source = sourceState; + destination = destinationState; } private List actions = new ArrayList(); @@ -60,9 +60,9 @@ return event; } - public void setEvent(Event event) { - this.event = event; - assert event != null; + public void setEvent(Event anEvent) { + assert anEvent != null; + event = anEvent; } private State source; 1.2 +4 -1 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/ConditionFactory.java Index: ConditionFactory.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/ConditionFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ConditionFactory.java 30 May 2003 19:32:43 -0000 1.1 +++ ConditionFactory.java 30 May 2003 19:59:15 -0000 1.2 @@ -13,7 +13,10 @@ * * @author andreas */ -public class ConditionFactory { +public final class ConditionFactory { + + private ConditionFactory() { + } protected static Condition createCondition( String className, 1.2 +3 -0 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java Index: WorkflowBuilder.java =================================================================== RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WorkflowBuilder.java 30 May 2003 19:32:43 -0000 1.1 +++ WorkflowBuilder.java 30 May 2003 19:59:15 -0000 1.2 @@ -30,6 +30,9 @@ * @author andreas */ public class WorkflowBuilder { + + protected WorkflowBuilder() { + } public static final String NAMESPACE = "http://apache.org/cocoon/lenya/workflow/1.0"; public static final String DEFAULT_PREFIX = "wf"; --------------------------------------------------------------------- To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org