Changeset 2291 for sandbox/workflow


Ignore:
Timestamp:
03/17/10 16:39:47 (14 years ago)
Author:
pedroerp
Message:

Ticket #609 - Corrigindo demais pendências na utilização da nova factory.

Location:
sandbox/workflow/branches/609
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • sandbox/workflow/branches/609/inc/class.bo_userinterface.inc.php

    r2267 r2291  
    10701070        function callVoipConnect($params) 
    10711071        { 
    1072                 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP'); 
     1072                $cachedLDAP = Factory::newInstance('CachedLDAP'); 
    10731073                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP); 
    10741074 
  • sandbox/workflow/branches/609/inc/class.so_adminaccess.inc.php

    r2233 r2291  
    202202                { 
    203203                        $GLOBALS['phpgw']->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 
    204                         $GLOBALS['phpgw']->acl =& Factory::getForeignInstance('phpgwapi', 'acl', $userID); 
     204                        $GLOBALS['phpgw']->acl =& Factory::getInstance('acl', $userID); 
    205205                } 
    206206 
  • sandbox/workflow/branches/609/inc/engine/config.egw.inc.php

    r2264 r2291  
    305305                { 
    306306                        // This way we create a new run_activity instance for the next activity 
    307                         $run_activity = Factory::getInstance('workflow.run_activity.go'); 
     307                        $run_activity = Factory::getInstance('run_activity'); 
    308308                        $data = $run_activity->go($activityId, $iid, $auto); 
    309309                        return $data; 
  • sandbox/workflow/branches/609/lib/factory/BaseFactory.php

    r2278 r2291  
    3434         * atribute. 
    3535         * 
     36         * @param string $className Class name. 
     37         * @param string $fileName Name of the file that contains the class definition. 
     38         * @param string $relativePath The path to the file, relative to $basePath. 
     39         * @param string $basePath Base path to append $relativePath. Optional. 
    3640         * @access protected 
    3741         * @return void 
     
    5559         * pointers (&) to avoid object duplications. 
    5660         * 
     61         * @param string $className Name of the class. 
     62         * @param array $classArgs Parameters to the class's constructor. 
    5763         * @access public 
    5864         * @return object 
     
    9096         * @todo Maybe we don't have to use the reflection 
    9197         *               class here. Future work... 
     98         * @param string $className Name of the class. 
     99         * @param array $classArgs Parameters to the class's constructor. 
    92100         * @access public 
    93101         * @return object 
     
    121129         * '$_fileInfo' array. 
    122130         * 
     131         * @param string $className Key to search for into the internal cache. 
    123132         * @access private 
    124133         * @return array 
     
    133142         * for upcoming requests. 
    134143         * 
     144         * @param string $className Name of the class. 
     145         * @param object Object whose reference will be stored. 
    135146         * @access private 
    136147         * @return boolean 
     
    150161         * it could be the only place to include files. 
    151162         * 
     163         * @param string $className Key to search for into internal cache. 
    152164         * @access private 
    153165         * @return boolean 
  • sandbox/workflow/branches/609/lib/factory/Factory.php

    r2278 r2291  
    9090         * values are 'getInstance' and 'newInstance'. 
    9191         * 
     92         * @param string $methodName Name of the BaseFactory method to call. 
     93         * @param array $args Parameters to class's constructor. 
    9294         * @access private 
    9395         * @return object 
  • sandbox/workflow/branches/609/lib/factory/ProcessWrapperFactory.php

    r2258 r2291  
    2323{ 
    2424 
     25        /** 
     26         * Just forward the call. 
     27         * 
     28         * @access public 
     29         * @return object 
     30         */ 
    2531        public function &getInstance() { 
    2632 
    2733                $args = func_get_args(); 
     34 
     35                /** 
     36                 * To save memory and processing, we store caches of objects instantiated 
     37                 * by the factory. When we use this beautiful function (call_user_func_array), 
     38                 * it makes an unexpected copy of the object. Of course we don't want it. 
     39                 * For now, we will keep doing copies. 
     40                 */ 
    2841                return call_user_func_array(array(Factory, "getInstance"), $args); 
    2942 
    3043        } 
    3144 
     45 
     46        /** 
     47         * Just forward the call. 
     48         * 
     49         * @access public 
     50         * @return object 
     51         */ 
    3252        public function &newInstance() { 
    3353 
    3454                $args = func_get_args(); 
     55 
     56                /* read the comment above */ 
    3557                return call_user_func_array(array(Factory, "newInstance"), $args); 
    3658 
  • sandbox/workflow/branches/609/lib/factory/WorkflowFactory.php

    r2278 r2291  
    5252                $this->registerFileInfo('WorkflowLDAP', 'class.WorkflowLDAP.inc.php', 'inc'); 
    5353                $this->registerFileInfo('WorkflowSecurity', 'class.WorkflowSecurity.inc.php', 'inc'); 
     54                $this->registerFileInfo('WorkflowMacro', 'class.WorkflowMacro.inc.php', 'inc'); 
     55                $this->registerFileInfo('WorkflowJobManager', 'class.WorkflowJobManager.inc.php', 'inc'); 
    5456                $this->registerFileInfo('ResourcesRedirector', 'class.ResourcesRedirector.inc.php', 'inc'); 
    5557                $this->registerFileInfo('TemplateServer', 'class.TemplateServer.inc.php', 'inc'); 
     
    5759                $this->registerFileInfo('BrowserInfo', 'class.BrowserInfo.inc.php', 'inc'); 
    5860                $this->registerFileInfo('JobScheduler', 'class.JobScheduler.inc.php', 'inc'); 
     61                $this->registerFileInfo('Thread', 'class.Thread.inc.php', 'inc'); 
     62                $this->registerFileInfo('Paging', 'class.Paging.inc.php', 'inc'); 
    5963                $this->registerFileInfo('UserPictureProvider', 'class.UserPictureProvider.inc.php', 'inc'); 
    6064 
     
    6367                $this->registerFileInfo('workflow_smarty', 'class.workflow_smarty.inc.php', 'inc'); 
    6468                $this->registerFileInfo('workflow_acl', 'class.workflow_acl.inc.php', 'inc'); 
     69                $this->registerFileInfo('workflow_process', 'class.workflow_process.inc.php', 'inc'); 
    6570                $this->registerFileInfo('workflow_processmanager', 'class.workflow_processmanager.inc.php', 'inc'); 
    6671                $this->registerFileInfo('workflow_wfruntime', 'class.workflow_wfruntime.inc.php', 'inc'); 
    6772                $this->registerFileInfo('workflow_gui', 'class.workflow_gui.inc.php', 'inc'); 
    6873                $this->registerFileInfo('workflow_rolemanager', 'class.workflow_rolemanager.inc.php', 'inc'); 
     74                $this->registerFileInfo('workflow_baseactivity', 'class.workflow_baseactivity.inc.php', 'inc'); 
    6975                $this->registerFileInfo('workflow_activitymanager', 'class.workflow_activitymanager.inc.php', 'inc'); 
    7076                $this->registerFileInfo('workflow_instance', 'class.workflow_instance.inc.php', 'inc'); 
    7177 
     78                $this->registerFileInfo('bo_userinterface', 'class.bo_userinterface.inc.php', 'inc'); 
    7279                $this->registerFileInfo('bo_participants', 'class.bo_participants.inc.php', 'inc'); 
    7380                $this->registerFileInfo('bo_agent_mail_smtp', 'class.bo_agent_mail_smtp.inc.php', 'inc'); 
     
    7784 
    7885                /* registering egw external classes */ 
    79                 $this->registerFileInfo('phpgw', 'class.phpgw.inc.php', '', EGW_INC_ROOT); 
    8086                $this->registerFileInfo('db', 'class.db.inc.php', '', EGW_INC_ROOT); 
     87                $this->registerFileInfo('acl', 'class.acl.inc.php', '', EGW_INC_ROOT); 
    8188                $this->registerFileInfo('accounts', 'class.accounts.inc.php', '', EGW_INC_ROOT); 
    8289                $this->registerFileInfo('config', 'class.config.inc.php', '', EGW_INC_ROOT); 
  • sandbox/workflow/branches/609/lib/security/Security.php

    r2258 r2291  
    9090         * previous function. 
    9191         * 
     92         * @param integer $depth The deepness of the fileName in backtrace. 
    9293         * @access public 
    9394         * @return boolean 
Note: See TracChangeset for help on using the changeset viewer.