- Refactor to increase code reuse.

zetacomponents · Sep 1, 2009 · c0477f8 · c0477f8
1 parent c905baa
commit c0477f8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 46 deletions.
diff --git a/design/class_diagram.png b/design/class_diagram.png
diff --git a/src/interfaces/visitor.php b/src/interfaces/visitor.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * Abstract base class for visitor implementations that want to process
+ * Base class for visitor implementations that want to process
  * a workflow using the Visitor design pattern.
  *
  * visit() is called on each of the nodes in the workflow in a top-down,
@@ -21,7 +21,7 @@
  * @package Workflow
  * @version //autogen//
  */
-abstract class ezcWorkflowVisitor
+class ezcWorkflowVisitor implements Countable
 {
     /**
      * Holds the visited nodes.
@@ -38,6 +38,16 @@ public function __construct()
         $this->visited = new SplObjectStorage;
     }
 
+    /**
+     * Returns the number of visited nodes.
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return count( $this->visited );
+    }
+
     /**
      * Visit the $visitable.
      *

diff --git a/src/visitors/node_counter.php b/src/visitors/node_counter.php
diff --git a/src/workflow.php b/src/workflow.php
@@ -253,9 +253,10 @@ public function __isset( $propertyName )
      */
     public function count()
     {
-        $counter = new ezcWorkflowVisitorNodeCounter( $this );
+        $visitor = new ezcWorkflowVisitor;
+        $this->accept( $visitor );
 
-        return $counter->getNumNodes();
+        return count( $visitor );
     }
 
     /**

diff --git a/src/workflow_autoload.php b/src/workflow_autoload.php
@@ -85,7 +85,6 @@
     'ezcWorkflowUtil'                             => 'Workflow/util.php',
     'ezcWorkflowVariableHandler'                  => 'Workflow/interfaces/variable_handler.php',
     'ezcWorkflowVisitorNodeCollector'             => 'Workflow/visitors/node_collector.php',
-    'ezcWorkflowVisitorNodeCounter'               => 'Workflow/visitors/node_counter.php',
     'ezcWorkflowVisitorReset'                     => 'Workflow/visitors/reset.php',
     'ezcWorkflowVisitorVerification'              => 'Workflow/visitors/verification.php',
     'ezcWorkflowVisitorVisualization'             => 'Workflow/visitors/visualization.php',