lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl WorkflowImpl.java WorkflowBuilder.java TransitionImpl.java StateImpl.java ConditionFactory.java BooleanVariableImpl.java ActionImpl.java WorkflowFactoryImpl.java WorkflowDocument.java CMSSituation.java BooleanVariableInstanceImpl.java WorkflowInstanceImpl.java EventImpl.java
Date Fri, 30 May 2003 17:19:16 GMT
andreas     2003/05/30 10:19:16

  Modified:    src/java/org/apache/lenya/cms/workflow/impl
                        WorkflowImpl.java WorkflowBuilder.java
                        TransitionImpl.java StateImpl.java
                        ConditionFactory.java BooleanVariableImpl.java
                        ActionImpl.java WorkflowFactoryImpl.java
                        WorkflowDocument.java CMSSituation.java
                        BooleanVariableInstanceImpl.java
                        WorkflowInstanceImpl.java EventImpl.java
  Log:
  reducing visibility to protected to force encapsulated usage
  
  Revision  Changes    Path
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WorkflowImpl.java	30 May 2003 14:58:00 -0000	1.4
  +++ WorkflowImpl.java	30 May 2003 17:19:15 -0000	1.5
  @@ -21,7 +21,7 @@
   public class WorkflowImpl implements Workflow {
   
       /** Creates a new instance of WorkflowImpl */
  -    public WorkflowImpl(State initialState) {
  +    protected WorkflowImpl(State initialState) {
           this.initialState = initialState;
           addState(initialState);
       }
  
  
  
  1.6       +12 -12    cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowBuilder.java
  
  Index: WorkflowBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WorkflowBuilder.java	30 May 2003 10:51:51 -0000	1.5
  +++ WorkflowBuilder.java	30 May 2003 17:19:15 -0000	1.6
  @@ -38,7 +38,7 @@
       public static final String NAMESPACE = "http://apache.org/cocoon/lenya/workflow/1.0";
       public static final String DEFAULT_PREFIX = "wf";
   
  -    public Workflow buildWorkflow(File file) throws WorkflowBuildException {
  +    protected Workflow buildWorkflow(File file) throws WorkflowBuildException {
           Workflow workflow;
   
           try {
  @@ -51,7 +51,7 @@
           return workflow;
       }
   
  -    public Workflow buildWorkflow(Document document)
  +    protected Workflow buildWorkflow(Document document)
           throws
               ParserConfigurationException,
               SAXException,
  @@ -114,16 +114,16 @@
               && (initialAttribute.equals("yes") || initialAttribute.equals("true"));
       }
   
  -    public static final String STATE_ELEMENT = "state";
  -    public static final String TRANSITION_ELEMENT = "transition";
  -    public static final String EVENT_ELEMENT = "event";
  -    public static final String CONDITION_ELEMENT = "condition";
  -    public static final String ACTION_ELEMENT = "action";
  -    public static final String ID_ATTRIBUTE = "id";
  -    public static final String INITIAL_ATTRIBUTE = "initial";
  -    public static final String SOURCE_ATTRIBUTE = "source";
  -    public static final String DESTINATION_ATTRIBUTE = "destination";
  -    public static final String CLASS_ATTRIBUTE = "class";
  +	protected static final String STATE_ELEMENT = "state";
  +	protected static final String TRANSITION_ELEMENT = "transition";
  +	protected static final String EVENT_ELEMENT = "event";
  +	protected static final String CONDITION_ELEMENT = "condition";
  +	protected static final String ACTION_ELEMENT = "action";
  +	protected static final String ID_ATTRIBUTE = "id";
  +	protected static final String INITIAL_ATTRIBUTE = "initial";
  +	protected static final String SOURCE_ATTRIBUTE = "source";
  +	protected static final String DESTINATION_ATTRIBUTE = "destination";
  +	protected static final String CLASS_ATTRIBUTE = "class";
   
       protected StateImpl buildState(Element element) {
           assert element.getLocalName().equals(STATE_ELEMENT);
  
  
  
  1.4       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/TransitionImpl.java
  
  Index: TransitionImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/TransitionImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TransitionImpl.java	28 May 2003 15:28:08 -0000	1.3
  +++ TransitionImpl.java	30 May 2003 17:19:15 -0000	1.4
  @@ -22,7 +22,7 @@
   public class TransitionImpl implements Transition {
   
       /** Creates a new instance of TransitionImpl */
  -    public TransitionImpl(State source, State destination) {
  +    protected TransitionImpl(State source, State destination) {
   
           assert source != null;
           assert destination != null;
  
  
  
  1.4       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/StateImpl.java
  
  Index: StateImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/StateImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StateImpl.java	28 May 2003 15:27:32 -0000	1.3
  +++ StateImpl.java	30 May 2003 17:19:15 -0000	1.4
  @@ -15,7 +15,7 @@
   public class StateImpl implements State {
   
       /** Creates a new instance of StateImpl */
  -    public StateImpl(String id) {
  +    protected StateImpl(String id) {
           assert id != null;
           this.id = id;
       }
  
  
  
  1.5       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/ConditionFactory.java
  
  Index: ConditionFactory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/ConditionFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConditionFactory.java	28 May 2003 15:17:57 -0000	1.4
  +++ ConditionFactory.java	30 May 2003 17:19:15 -0000	1.5
  @@ -15,7 +15,7 @@
    */
   public class ConditionFactory {
   
  -    public static Condition createCondition(
  +    protected static Condition createCondition(
           String className,
           String expression)
           throws WorkflowBuildException {
  
  
  
  1.2       +3 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/BooleanVariableImpl.java
  
  Index: BooleanVariableImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/BooleanVariableImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BooleanVariableImpl.java	28 May 2003 15:08:20 -0000	1.1
  +++ BooleanVariableImpl.java	30 May 2003 17:19:15 -0000	1.2
  @@ -15,7 +15,9 @@
   public class BooleanVariableImpl implements BooleanVariable {
   
       /** Creates a new instance of BooleanVariableImpl */
  -    public BooleanVariableImpl(String name) {
  +    protected BooleanVariableImpl(String name) {
  +    	assert name != null;
  +    	this.name = name;
       }
   
       private String name;
  
  
  
  1.4       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/ActionImpl.java
  
  Index: ActionImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/ActionImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ActionImpl.java	28 May 2003 15:16:33 -0000	1.3
  +++ ActionImpl.java	30 May 2003 17:19:15 -0000	1.4
  @@ -16,7 +16,7 @@
       implements Action {
       
       /** Creates a new instance of ActionImpl */
  -    public ActionImpl(String id) {
  +    protected ActionImpl(String id) {
           assert id != null;
           this.id = id;
       }
  
  
  
  1.3       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowFactoryImpl.java
  
  Index: WorkflowFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowFactoryImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WorkflowFactoryImpl.java	30 May 2003 14:57:30 -0000	1.2
  +++ WorkflowFactoryImpl.java	30 May 2003 17:19:15 -0000	1.3
  @@ -30,7 +30,7 @@
           "config/workflow".replace('/', File.separatorChar);
   
       /** Creates a new instance of WorkflowFactory */
  -    public WorkflowFactoryImpl(Document document, User user) {
  +    protected WorkflowFactoryImpl(Document document, User user) {
   
           assert document != null;
           this.document = document;
  
  
  
  1.2       +2 -2      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowDocument.java
  
  Index: WorkflowDocument.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowDocument.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WorkflowDocument.java	30 May 2003 14:57:06 -0000	1.1
  +++ WorkflowDocument.java	30 May 2003 17:19:15 -0000	1.2
  @@ -63,7 +63,7 @@
    */
   public class WorkflowDocument extends AbstractWorkflowable {
   
  -    public WorkflowDocument(Document document) throws WorkflowBuildException {
  +    protected WorkflowDocument(Document document) throws WorkflowBuildException {
           assert document != null;
           this.document = document;
   
  @@ -134,7 +134,7 @@
       /**
        * @return
        */
  -    public Workflow getWorkflow() {
  +    protected Workflow getWorkflow() {
           return workflow;
       }
   
  
  
  
  1.2       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/CMSSituation.java
  
  Index: CMSSituation.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/CMSSituation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CMSSituation.java	28 May 2003 15:08:20 -0000	1.1
  +++ CMSSituation.java	30 May 2003 17:19:15 -0000	1.2
  @@ -16,7 +16,7 @@
   public class CMSSituation implements Situation {
   
       /** Creates a new instance of Situation */
  -    public CMSSituation(User user) {
  +    protected CMSSituation(User user) {
   
           assert user != null;
           this.user = user;
  
  
  
  1.2       +1 -1      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/BooleanVariableInstanceImpl.java
  
  Index: BooleanVariableInstanceImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/BooleanVariableInstanceImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BooleanVariableInstanceImpl.java	28 May 2003 15:08:20 -0000	1.1
  +++ BooleanVariableInstanceImpl.java	30 May 2003 17:19:15 -0000	1.2
  @@ -17,7 +17,7 @@
       private boolean value;
   
       /** Creates a new instance of BooleanVariableInstanceImpl */
  -    public BooleanVariableInstanceImpl() {
  +    protected BooleanVariableInstanceImpl() {
       }
   
       /**
  
  
  
  1.4       +2 -2      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowInstanceImpl.java
  
  Index: WorkflowInstanceImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/WorkflowInstanceImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WorkflowInstanceImpl.java	28 May 2003 15:42:54 -0000	1.3
  +++ WorkflowInstanceImpl.java	30 May 2003 17:19:15 -0000	1.4
  @@ -22,7 +22,7 @@
   public class WorkflowInstanceImpl implements WorkflowInstance {
   
       /** Creates a new instance of WorkflowInstanceImpl */
  -    public WorkflowInstanceImpl(Workflow workflow) {
  +    protected WorkflowInstanceImpl(Workflow workflow) {
           assert workflow != null;
           this.workflow = workflow;
           setCurrentState(getWorkflow().getInitialState());
  @@ -74,7 +74,7 @@
   
       private State currentState;
   
  -    public void setCurrentState(State state) {
  +    protected void setCurrentState(State state) {
           assert state != null
               && ((WorkflowImpl) getWorkflow()).containsState(state);
           this.currentState = state;
  
  
  
  1.4       +2 -2      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/EventImpl.java
  
  Index: EventImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/impl/EventImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EventImpl.java	28 May 2003 15:19:22 -0000	1.3
  +++ EventImpl.java	30 May 2003 17:19:15 -0000	1.4
  @@ -15,14 +15,14 @@
   public class EventImpl implements Event {
   
       /** Creates a new instance of EventImpl */
  -    public EventImpl(String id) {
  +    protected EventImpl(String id) {
           assert id != null;
           this.id = id;
       }
   
       private String id;
   
  -    public String getId() {
  +    protected String getId() {
           return id;
       }
   
  
  
  

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


Mime
View raw message