Changeset 2372 for sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.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/common/WfRuntime.php (modified) (3 diffs)

sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.php

@@ -86 +86 @@
    * @access public
    */
-  function WfRuntime(&$db) 
+  function WfRuntime() 
   {
     $this->child_name = 'WfRuntime';
-    parent::Base($db);
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'WfSecurity.php');
-    
+    parent::Base();
+
     //first the activity is not set
     $this->activity = null;
-    $this->instance = new Instance($this->db);
-    $this->process = new Process($this->db);
-    $this->security = new WfSecurity($this->db); 
+    $this->instance = &Factory::newInstance('Instance');
+    $this->process = &Factory::newInstance('Process');
+    $this->security = &Factory::getInstance('WfSecurity');
   }
 
@@ -276 +272 @@
       return false;
     }
-    $base_activity = new BaseActivity($this->db);
+    $base_activity = &Factory::newInstance('BaseActivity');
     $this->activity =& $base_activity->getActivity($activity_id, $with_roles, $with_agents);
     if (!$this->activity)
@@ -1091 +1087 @@
     $workflow = $GLOBALS['workflow'];
     unset($_REQUEST['iid']);
-    $run_activity = CreateObject('workflow.run_activity');
+    $run_activity = Factory::getInstance('run_activity');
     $run_activity->runtime->instance->parentInstanceId = $this->instance_id;
     $run_activity->runtime->instance->parentActivityId = $this->activity_id;