Return-Path: 
 <lenya-cvs-return-88-apmail-cocoon-lenya-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-lenya-cvs-archive@cocoon.apache.org
Received: (qmail 7706 invoked by uid 500); 30 May 2003 14:58:00 -0000
Mailing-List: contact lenya-cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Post: <mailto:lenya-cvs@cocoon.apache.org>
List-Help: <mailto:lenya-cvs-help@cocoon.apache.org>
List-Unsubscribe: <mailto:lenya-cvs-unsubscribe@cocoon.apache.org>
List-Subscribe: <mailto:lenya-cvs-subscribe@cocoon.apache.org>
Reply-To: "Lenya CVS Mailing List" <lenya-cvs@cocoon.apache.org>
Delivered-To: mailing list lenya-cvs@cocoon.apache.org
Received: (qmail 7695 invoked from network); 30 May 2003 14:58:00 -0000
Date: 30 May 2003 14:58:00 -0000
Message-ID: <20030530145800.97545.qmail@icarus.apache.org>
From: andreas@apache.org
To: cocoon-lenya-cvs@apache.org
Subject: cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl
 WorkflowImpl.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

andreas     2003/05/30 07:58:00

  Modified:    src/java/org/apache/lenya/cms/workflow/impl
                        WorkflowImpl.java
  Log:
  managing states separately
  
  Revision  Changes    Path
  1.4       +20 -11    cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowImpl.java
  
  Index: WorkflowImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WorkflowImpl.java	28 May 2003 15:33:15 -0000	1.3
  +++ WorkflowImpl.java	30 May 2003 14:58:00 -0000	1.4
  @@ -6,7 +6,9 @@
   
   package org.apache.lenya.cms.workflow.impl;
   
  +import java.util.HashMap;
   import java.util.HashSet;
  +import java.util.Map;
   import java.util.Set;
   import org.apache.lenya.cms.workflow.State;
   import org.apache.lenya.cms.workflow.Transition;
  @@ -21,6 +23,7 @@
       /** Creates a new instance of WorkflowImpl */
       public WorkflowImpl(State initialState) {
           this.initialState = initialState;
  +        addState(initialState);
       }
   
       private State initialState;
  @@ -34,6 +37,11 @@
       }
   
       private Set transitions = new HashSet();
  +    private Map states = new HashMap();
  +    
  +    private void addState(State state) {
  +        states.put(((StateImpl) state).getId(), state);
  +    }
   
       /**
        * Adds a transition.
  @@ -41,6 +49,8 @@
       protected void addTransition(TransitionImpl transition) {
           assert transition != null;
           transitions.add(transition);
  +        addState(transition.getSource());
  +        addState(transition.getDestination());
       }
   
       protected TransitionImpl[] getTransitions() {
  @@ -81,16 +91,15 @@
        * @return <code>true</code> if the state is contained, <code>false</code> otherwise.
        */
       protected boolean containsState(State state) {
  -        Transition transitions[] = getTransitions();
  -        boolean result = false;
  -        for (int i = 0; i < transitions.length; i++) {
  -            TransitionImpl transition = (TransitionImpl) transitions[i];
  -            if (transition.getSource().equals(state)
  -                || transition.getDestination().equals(state)) {
  -                result = true;
  -            }
  -        }
  -        return result;
  +        return states.containsValue(state);
       }
  -
  +    
  +    protected State[] getStates() {
  +        return (State[]) states.values().toArray(new State[states.size()]);
  +    }
  +    
  +    protected State getState(String name) {
  +        return (State) states.get(name); 
  +    }
  +    
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org