Changeset 2372 for sandbox/workflow/trunk/inc/engine/src/API/BaseActivity.php

Timestamp:

03/29/10 14:46:01 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:

• sandbox/workflow/trunk/inc/engine/src/API/BaseActivity.php (modified) (2 diffs)

sandbox/workflow/trunk/inc/engine/src/API/BaseActivity.php

@@ -97 +97 @@
    * @access public
    */
-  function BaseActivity(&$db)
+  function BaseActivity()
   {
     $this->type='base';
     $this->child_name = 'BaseActivity';
-    parent::Base($db);
+    parent::Base();
   }
 
@@ -122 +122 @@
     if(!$result || !$result->numRows() ) return false;
     $res = $result->fetchRow();
+
     switch($res['wf_type']) {
       case 'start':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Start.php');
-        $act = new Start($this->db);  
-        break;
+        $act = &Factory::newInstance('Start');
+        break;
+
       case 'end':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'End.php');
-        $act = new End($this->db);
-        break;
+        $act = &Factory::newInstance('End');
+        break;
+
       case 'join':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Join.php');
-        $act = new Join($this->db);
-        break;
+        $act = &Factory::newInstance('Join');
+        break;
+
       case 'split':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Split.php');
-        $act = new Split($this->db);
-        break;
+        $act = &Factory::newInstance('Split');
+        break;
+
       case 'standalone':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Standalone.php');
-        $act = new Standalone($this->db);
-        break;
+        $act = &Factory::newInstance('Standalone');
+        break;
+
       case 'view':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'View.php');
-        $act = new View($this->db);
-        break;
+        $act = &Factory::newInstance('View');
+        break;
+
       case 'switch':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'SwitchActivity.php');
-        $act = new SwitchActivity($this->db);
-        break;
+        $act = &Factory::newInstance('SwitchActivity');
+        break;
+
       case 'activity':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Activity.php');
-        $act = new Activity($this->db);
-        break;
+        $act = &Factory::newInstance('Activity');
+        break;
+
       default:
         trigger_error('Unknown activity type:'.$res['wf_type'],E_USER_WARNING);
     }
-    
+
     $act->setName($res['wf_name']);
     $act->setProcessId($res['wf_p_id']);