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

sandbox/workflow/trunk/inc/engine/src/ProcessManager/ActivityManager.php

@@ -26 +26 @@
    * @access public
    */
-  function ActivityManager(&$db)
-  {
-    parent::BaseManager($db);
+  function ActivityManager()
+  {
+    parent::BaseManager();
     $this->child_name = 'ActivityManager';
     require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager' .SEP . 'ProcessManager.php');
@@ -370 +370 @@
   function build_process_graph($pId)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $attributes = Array(
     
     );
-    $graph = new Process_GraphViz(true,$attributes);
+    $graph = &Factory::newInstance('Process_GraphViz', true, $attributes);
     $name = $this->process_manager->_get_normalized_name($pId);
     $graph->set_pid($name);
@@ -747 +747 @@
   {
     require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP . 'BaseActivity.php');
-    $act = new BaseActivity($this->db);
+    $act = &Factory::newInstance('BaseActivity');
     //Warning, we now use the BaseActivity object for it, interactivity and autorouting is now true/fales, not y/n
     return ($act->getActivity($activityId,false,true, true));
@@ -825 +825 @@
   function remove_activity($pId, $activityId, $transaction = true)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $proc_info = $this->process_manager->get_process($pId);
     $actname = $this->_get_normalized_name($activityId);
@@ -888 +888 @@
   function replace_activity($pId, $activityId, $vars, $create_files=true)
   {
-    if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);
+    if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager');
     $TABLE_NAME = GALAXIA_TABLE_PREFIX.'activities';
     $now = date("U");
@@ -1195 +1195 @@
     elseif ( (!($result=='*')) && $performAccessCheck)
     {
-      $wf_security = new WfSecurity($this->db);
+      $wf_security = &Factory::getInstance('WfSecurity', $this->db);
       // perform the check
       if (!($wf_security->checkUserAccess($result,$activityId)))