Changeset 2311 for sandbox/workflow/branches/609/inc/class.bo_monitors.inc.php

Timestamp:

03/19/10 17:22:08 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Migrando instanciação das classes da engine para a factory.

File:

• sandbox/workflow/branches/609/inc/class.bo_monitors.inc.php (modified) (10 diffs)

sandbox/workflow/branches/609/inc/class.bo_monitors.inc.php

@@ -12 +12 @@
 require_once('class.bo_ajaxinterface.inc.php');
 
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'InstanceManager.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessMonitor' . SEP . 'ProcessMonitor.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Instance.php');
-require_once('class.workflow_acl.inc.php');
+require_once('class.workflow_acl.inc.php'); /* can we remove this? */
 require_once('class.bo_adminaccess.inc.php');
 require_once('class.powergraphic.inc.php');
@@ -134 +127 @@
         {
                 parent::bo_ajaxinterface();
-                $GLOBALS['ajax']->gui   = new GUI(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $GLOBALS['ajax']->gui   = &Factory::newInstance('GUI');
                 $this->userID                   = $_SESSION['phpgw_info']['workflow']['account_id'];
                 $this->isWorkflowAdmin  = $GLOBALS['ajax']->acl->checkWorkflowAdmin($this->userID);
-                $this->processManager   = new ProcessManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
-                $this->activityManager  = new ActivityManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
-                $this->instanceManager  = new InstanceManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
-                $this->roleManager              = new RoleManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
-                $this->processMonitor   = new ProcessMonitor(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $this->processManager   = &Factory::newInstance('ProcessManager');
+                $this->activityManager  = &Factory::newInstance('ActivityManager');
+                $this->instanceManager  = &Factory::newInstance('InstanceManager');
+                $this->roleManager              = &Factory::newInstance('RoleManager');
+                $this->processMonitor   = &Factory::newInstance('ProcessMonitor');
         }
 
@@ -169 +162 @@
         private function convertFiltersToSQL($filters)
         {
-                require_once 'nano/JSON.php';
 
                 /* desserializa os dados */
-                $JSON = new Services_JSON();
+                $JSON = &Factory::newInstance('Services_JSON');
                 /* desserializa a array principal, depois desserializa cada elemento desta array e, por fim, converte os elementos (que estão em forma de objeto) para array associativa */
                 $filters = array_map('get_object_vars', array_map(array($JSON, 'decode'), $JSON->decode($filters)));
@@ -648 +640 @@
                 if ($params['ns'] == 'aborted')
                 {
-                        $realInstance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                        $realInstance = &Factory::newInstance('Instance');
                         $realInstance->getInstance($params['iid']);
                         if (!empty($realInstance->instanceId))
@@ -684 +676 @@
 
                 /* use next user or * for the new instance */
-                $realInstance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $realInstance = &Factory::newInstance('Instance');
                 $realInstance->getInstance($params['iid'], false, false);
                 $user = $realInstance->getNextUser($params['aid']);
@@ -751 +743 @@
 
                 $maximumDisplaySize = 100;
-                $instance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $instance = &Factory::newInstance('Instance');
                 $instance->getInstance($params['iid']);
 
@@ -783 +775 @@
                         return "Você não tem permissão para executar este procedimento!";
 
-                $instance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $instance = &Factory::newInstance('Instance');
                 $instance->getInstance($params['iid']);
                 $output = $params;
@@ -804 +796 @@
                 $maximumDisplaySize = 100;
 
-                $instance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $instance = &Factory::newInstance('Instance');
                 $instance->getInstance($params['iid']);
                 $instance->set($params['name'], $params['value']);
@@ -835 +827 @@
                         return "Você não tem permissão para executar este procedimento!";
 
-                $instance = new Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
+                $instance = &Factory::newInstance('Instance');
                 $instance->getInstance($params['iid']);
                 $instance->clear($params['name']);
@@ -858 +850 @@
                 $output = array();
                 $urlPrefix = 'workflow/inc/class.powergraphic.inc.php?';
-                $powergraphic = new powergraphic;
+                $powergraphic = &Factory::getInstance('powergraphic');
                 $powergraphic->graphic_1 = $params['pid'];
                 $powergraphic->skin = 1;