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

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

@@ -66 +66 @@
          * @access public
          */
-        function ProcessManager(&$db)
-        {
-                parent::BaseManager($db);
+        function ProcessManager()
+        {
+                parent::BaseManager();
                 $this->child_name = 'ProcessManager';
-                require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ActivityManager.php');
-                require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'JobManager.php');
                 // $this->activity_manager is not set here to avoid objects loading object A loading object B loading object A, etc
                 //$this->role_manager will only be loaded when needed as well
@@ -131 +129 @@
         function serialize_process($pId)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 // <process>
                 $out = '<process>'."\n";
@@ -459 +457 @@
         {
                 //Now the show begins
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
-                if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
+                if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager');
                 if (!isset($this->jobManager))
-                        $this->jobManager = new JobManager($this->db);
+                        $this->jobManager = &Factory::newInstance('JobManager');
 
                 // First create the process. Always inactive and inactive first.
@@ -620 +618 @@
         function new_process_version($pId, $minor=true)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 $oldpid = $pId;
                 //retrieve process info with config rows
@@ -671 +669 @@
                 }
                 // create roles
-                if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);
+                if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager');
                 $query = 'select * from '.GALAXIA_TABLE_PREFIX.'roles where wf_p_id=?';
                 $result = $this->query($query, array($oldpid));
@@ -853 +851 @@
         function remove_process($pId)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 if (!isset($this->jobManager))
-                        $this->jobManager = new JobManager($this->db);
+                        $this->jobManager = &Factory::newInstance('JobManager');
                 $this->deactivate_process($pId);
                 $name = $this->_get_normalized_name($pId);
@@ -919 +917 @@
         function replace_process($pId, &$vars, $create = true)
         {
-                if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                 $TABLE_NAME = GALAXIA_TABLE_PREFIX.'processes';
                 $now = date("U");
@@ -1296 +1294 @@
                 {
                         //Warning: this means you have to include the Process.php from the API
-                        $this->Process = new Process($this->db);
+                        $this->Process = &Factory::newInstance('Process');
                         $this->Process->getProcess($pId);
                         $result_array = $this->Process->getConfigValues($config_array);
@@ -1316 +1314 @@
         {
                 //Warning: this means you have to include the Process.php from the API
-                $this->Process = new Process($this->db);
+                $this->Process = &Factory::newInstance('Process');
                 $this->Process->getProcess($pId);
                 $this->Process->setConfigValues($config_array);