4124 - in experimental/Workflow/src: interfaces nodes [eZComponents: Experimental]

Author: Sebastian Bergmann
Date: 2006-11-29 09:26:16 +0100 (Wed, 29 Nov 2006)
New Revision: 4124

Log:
- Change default values for incoming/outgoing node constraints.
Modified:
   experimental/Workflow/src/interfaces/node.php
   experimental/Workflow/src/interfaces/node_merge.php
   experimental/Workflow/src/nodes/action.php
   experimental/Workflow/src/nodes/branch.php
   experimental/Workflow/src/nodes/end.php
   experimental/Workflow/src/nodes/input.php
   experimental/Workflow/src/nodes/start.php
   experimental/Workflow/src/nodes/sub_workflow.php

Modified: experimental/Workflow/src/interfaces/node.php
===================================================================
--- experimental/Workflow/src/interfaces/node.php       2006-11-29 08:24:18 UTC 
(rev 4123)
+++ experimental/Workflow/src/interfaces/node.php       2006-11-29 08:26:16 UTC 
(rev 4124)
@@ -59,35 +59,35 @@
 
     /**
      * Constraint: The minimum number of incoming nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $minInNodes = false;
+    protected $minInNodes = 1;
 
     /**
      * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $maxInNodes = false;
+    protected $maxInNodes = 1;
 
     /**
      * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $minOutNodes = false;
+    protected $minOutNodes = 1;
 
     /**
      * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $maxOutNodes = false;
+    protected $maxOutNodes = 1;
 
     /**
      * The number of incoming nodes.

Modified: experimental/Workflow/src/interfaces/node_merge.php
===================================================================
--- experimental/Workflow/src/interfaces/node_merge.php 2006-11-29 08:24:18 UTC 
(rev 4123)
+++ experimental/Workflow/src/interfaces/node_merge.php 2006-11-29 08:26:16 UTC 
(rev 4124)
@@ -25,22 +25,14 @@
     protected $minInNodes = 2;
 
     /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * Constraint: The maximum number of incoming nodes this node has to have
+     * to be valid.
      *
      * @var integer
      */
-    protected $minOutNodes = 1;
+    protected $maxInNodes = false;
 
     /**
-     * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $maxOutNodes = 1;
-
-    /**
      * @var array
      */
     protected $state;

Modified: experimental/Workflow/src/nodes/action.php
===================================================================
--- experimental/Workflow/src/nodes/action.php  2006-11-29 08:24:18 UTC (rev 
4123)
+++ experimental/Workflow/src/nodes/action.php  2006-11-29 08:26:16 UTC (rev 
4124)
@@ -17,38 +17,6 @@
 class ezcWorkflowNodeAction extends ezcWorkflowNode
 {
     /**
-     * Constraint: The minimum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $minInNodes = 1;
-
-    /**
-     * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $maxInNodes = 1;
-
-    /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $minOutNodes = 1;
-
-    /**
-     * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $maxOutNodes = 1;
-
-     /**
      * The service object that contains the business logic to be executed
      * when this node is executed.
      *

Modified: experimental/Workflow/src/nodes/branch.php
===================================================================
--- experimental/Workflow/src/nodes/branch.php  2006-11-29 08:24:18 UTC (rev 
4123)
+++ experimental/Workflow/src/nodes/branch.php  2006-11-29 08:26:16 UTC (rev 
4124)
@@ -19,30 +19,22 @@
 class ezcWorkflowNodeBranch extends ezcWorkflowNode
 {
     /**
-     * Constraint: The minimum number of incoming nodes this node has to have
+     * Constraint: The minimum number of outgoing nodes this node has to have
      * to be valid.
      *
      * @var integer
      */
-    protected $minInNodes = 1;
+    protected $minOutNodes = 2;
 
     /**
-     * Constraint: The maximum number of incoming nodes this node has to have
+     * Constraint: The maximum number of outgoing nodes this node has to have
      * to be valid.
      *
      * @var integer
      */
-    protected $maxInNodes = 1;
+    protected $maxOutNodes = false;
 
     /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $minOutNodes = 2;
-
-    /**
      * @var array
      */
     protected $configuration = array();

Modified: experimental/Workflow/src/nodes/end.php
===================================================================
--- experimental/Workflow/src/nodes/end.php     2006-11-29 08:24:18 UTC (rev 
4123)
+++ experimental/Workflow/src/nodes/end.php     2006-11-29 08:26:16 UTC (rev 
4124)
@@ -17,32 +17,16 @@
 class ezcWorkflowNodeEnd extends ezcWorkflowNode
 {
     /**
-     * Constraint: The minimum number of incoming nodes this node has to have
+     * Constraint: The minimum number of outgoing nodes this node has to have
      * to be valid.
      *
      * @var integer
      */
-    protected $minInNodes = 1;
-
-    /**
-     * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $maxInNodes = 1;
-
-    /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
     protected $minOutNodes = 0;
 
     /**
      * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
+     * to be valid.
      *
      * @var integer
      */

Modified: experimental/Workflow/src/nodes/input.php
===================================================================
--- experimental/Workflow/src/nodes/input.php   2006-11-29 08:24:18 UTC (rev 
4123)
+++ experimental/Workflow/src/nodes/input.php   2006-11-29 08:26:16 UTC (rev 
4124)
@@ -17,38 +17,6 @@
 class ezcWorkflowNodeInput extends ezcWorkflowNode
 {
     /**
-     * Constraint: The minimum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $minInNodes = 1;
-
-    /**
-     * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $maxInNodes = 1;
-
-    /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $minOutNodes = 1;
-
-    /**
-     * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $maxOutNodes = 1;
-
-    /**
      * Executes this node.
      *
      * @param ezcWorkflowExecution $execution

Modified: experimental/Workflow/src/nodes/start.php
===================================================================
--- experimental/Workflow/src/nodes/start.php   2006-11-29 08:24:18 UTC (rev 
4123)
+++ experimental/Workflow/src/nodes/start.php   2006-11-29 08:26:16 UTC (rev 
4124)
@@ -33,22 +33,6 @@
     protected $maxInNodes = 0;
 
     /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $minOutNodes = 1;
-
-    /**
-     * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $maxOutNodes = 1;
-
-    /**
      * Executes this node.
      *
      * @param ezcWorkflowExecution $execution

Modified: experimental/Workflow/src/nodes/sub_workflow.php
===================================================================
--- experimental/Workflow/src/nodes/sub_workflow.php    2006-11-29 08:24:18 UTC 
(rev 4123)
+++ experimental/Workflow/src/nodes/sub_workflow.php    2006-11-29 08:26:16 UTC 
(rev 4124)
@@ -17,38 +17,6 @@
 class ezcWorkflowNodeSubWorkflow extends ezcWorkflowNode
 {
     /**
-     * Constraint: The minimum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $minInNodes = 1;
-
-    /**
-     * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $maxInNodes = 1;
-
-    /**
-     * Constraint: The minimum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $minOutNodes = 1;
-
-    /**
-     * Constraint: The maximum number of outgoing nodes this node has to have
-     * to be valid. Set to -1 to disable this constraint (default).
-     *
-     * @var integer
-     */
-    protected $maxOutNodes = 1;
-
-    /**
      * Execution ID of the sub workflow,
      * 0 if it has not been started yet.
      *