Changeset 2292 for sandbox/workflow

Timestamp:

03/18/10 08:32:36 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Substituindo instanciações diretas (new) pela nova factory.

Location:

sandbox/workflow/branches/609/inc

Files:

• class.JobScheduler.inc.php (modified) (1 diff)
• class.bo_userinterface.inc.php (modified) (3 diffs)
• class.ui_adminsource.inc.php (modified) (2 diffs)
• class.ui_ajaxinterface.inc.php (modified) (2 diffs)
• class.ui_monitors.inc.php (modified) (2 diffs)
• local/classes/class.wf_engine.php (modified) (12 diffs)
• local/classes/class.wf_instance.php (modified) (2 diffs)

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

@@ -194 +194 @@
         Factory::getInstance('WorkflowMacro')->prepareEnvironment();
 
-        $job = new JobScheduler();
+        $job = Factory::newInstance('JobScheduler');
         $job->run();
 }

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

@@ -12 +12 @@
 require_once('class.so_userinterface.inc.php');
 require_once('class.bo_ajaxinterface.inc.php');
-require_once('class.Paging.inc.php');
 
 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php');
@@ -148 +147 @@
                 $itemsPerPage = isset($preferences['ui_items_per_page']) ? $preferences['ui_items_per_page'] : 15;
                 $lightVersion = ((isset($preferences['use_light_interface']) ? $preferences['use_light_interface'] : 0) == 1);
-                $paging = new Paging($itemsPerPage, $_POST);
+                $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST);
 
                 /* define the sorting */
@@ -726 +725 @@
                         /* paginate the result */
                         $itemsPerPage = isset($_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page']) ? $_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page'] : 15;
-                        $paging = new Paging($itemsPerPage, $_POST);
+                        $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST);
                         $output['instances'] = $paging->restrictItems($output['instances']);
                         $output['paging_links'] = $paging->commonLinks();

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

@@ -17 +17 @@
  */
 require_once dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php';
-require_once dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php';
 require_once 'engine' . SEP . 'config.ajax.inc.php';
 
@@ -43 +42 @@
         function ui_adminsource()
         {
-                $this->workflow_acl = new workflow_acl();
+                $this->workflow_acl = Factory::getInstance('workflow_acl');
                 $denyAccess = true;
                 if ($this->workflow_acl->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id']))

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

@@ -11 +11 @@
 \**************************************************************************/
 
-require_once 'class.workflow_acl.inc.php';
 require_once 'common.inc.php';
 require_once 'engine/class.ajax_config.inc.php';
@@ -50 +49 @@
         function set_wf_session()
         {
-                $acl = new workflow_acl();
+                $acl = Factory::getInstance('workflow_acl');
                 $_SESSION['phpgw_info']['workflow']['server_root'] = PHPGW_SERVER_ROOT;
                 $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC;

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

@@ -12 +12 @@
 
 require_once(dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php');
-require_once(dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php');
 /**
  * @package Workflow
@@ -37 +36 @@
         {
                 $this->set_wf_session();
-                $this->workflow_acl = new workflow_acl();
+                $this->workflow_acl = Factory::getInstance('workflow_acl');
 
                 if (!($this->workflow_acl->checkUserGroupAccessToType('MON', $_SESSION['phpgw_info']['workflow']['account_id']) || ($this->workflow_acl->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id']))))

sandbox/workflow/branches/609/inc/local/classes/class.wf_engine.php

@@ -90 +90 @@
         function continueInstance($activityID, $instanceID)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->continueInstance($activityID, $instanceID);
         }
@@ -104 +103 @@
         function abortInstance($instanceID)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->abort($instanceID);
         }
@@ -119 +117 @@
         function setInstanceName($instanceID, $name)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->setName($instanceID, $name);
         }
@@ -134 +131 @@
         function setInstancePriority($instanceID, $priority)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->setPriority($instanceID, $priority);
         }
@@ -149 +145 @@
         function getIdleInstances($numberOfDays, $activities = null)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->getIdle($numberOfDays, $activities);
         }
@@ -175 +170 @@
         function getInstancesByName($name)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 $preOutput = $WFInstance->getByName($name);
                 $output = array();
@@ -197 +191 @@
         function getChildInstances($instanceID = null, $activityID = null)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = Factory::getInstance('wf_instance');
                 $preOutput = $WFInstance->getChildren($instanceID, $activityID);
                 $output = array();
@@ -217 +210 @@
         function getInstanceProperties($instanceID)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->getProperties($instanceID);
         }
@@ -231 +223 @@
         function getChildInstanceProperties($instanceID)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->getProperties($instanceID);
         }
@@ -346 +337 @@
         function getUserInstances($users, $activities = null, $status = null)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->getByUser($users, $activities, $status);
         }
@@ -360 +350 @@
         function setInstanceProperty($instanceID, $nameProperty, $value)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->setProperty($instanceID, $nameProperty, $value);
         }
@@ -377 +366 @@
         function checkUserAccessToInstance($userID, $instanceID, $activityID, $writeAccess = true)
         {
-                require_once 'class.wf_instance.php';
-                $WFInstance = new wf_instance();
+                $WFInstance = &Factory::getInstance('wf_instance');
                 return $WFInstance->checkUserAccess($userID, $instanceID, $activityID, $writeAccess);
         }

sandbox/workflow/branches/609/inc/local/classes/class.wf_instance.php

@@ -456 +456 @@
                 if ($userID !== '*')
                 {
-                        require_once dirname(__FILE__) . '/class.wf_role.php';
-                        require_once dirname(__FILE__) . '/class.wf_engine.php';
-
-                        $wfRole = new wf_role();
-                        $engine = new wf_engine();
+                        $wfRole = Factory::getInstance('wf_role');
+                        $engine = Factory::getInstance('wf_engine');
                         /* get information about the activity */
                         if (($activityInfo = $engine->getActivityInformationByID($activityID)) === false)
@@ -529 +526 @@
 
                 /* try to get the role id */
-                require_once dirname(__FILE__) . '/class.wf_role.php';
-                $wfRole = new wf_role();
+                $wfRole = Factory::getInstance('wf_role');
                 if (($roleID = $wfRole->getRoleIdByName($roleName)) === false)
                         return false;