Changeset 2591 for trunk/workflow/inc/engine/src/API

Timestamp:

04/19/10 18:18:22 (14 years ago)

Author:

viani

Message:

Ticket #609 - Reconstrução da classe factory do workflow

Location:

trunk/workflow/inc/engine/src/API

Files:

• BaseActivity.php (modified) (2 diffs)
• Instance.php (modified) (5 diffs)
• Process.php (modified) (1 diff)
• activities/Activity.php (modified) (1 diff)
• activities/End.php (modified) (1 diff)
• activities/Join.php (modified) (1 diff)
• activities/Split.php (modified) (1 diff)
• activities/Standalone.php (modified) (1 diff)
• activities/Start.php (modified) (1 diff)
• activities/SwitchActivity.php (modified) (1 diff)
• activities/View.php (modified) (1 diff)

trunk/workflow/inc/engine/src/API/BaseActivity.php

@@ -97 +97 @@
    * @access public
    */
-  function BaseActivity(&$db)
+  function BaseActivity()
   {
     $this->type='base';
     $this->child_name = 'BaseActivity';
-    parent::Base($db);
+    parent::Base();
   }
 
@@ -122 +122 @@
     if(!$result || !$result->numRows() ) return false;
     $res = $result->fetchRow();
+
     switch($res['wf_type']) {
       case 'start':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Start.php');
-        $act = new Start($this->db);  
-        break;
+        $act = &Factory::newInstance('Start');
+        break;
+
       case 'end':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'End.php');
-        $act = new End($this->db);
-        break;
+        $act = &Factory::newInstance('End');
+        break;
+
       case 'join':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Join.php');
-        $act = new Join($this->db);
-        break;
+        $act = &Factory::newInstance('Join');
+        break;
+
       case 'split':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Split.php');
-        $act = new Split($this->db);
-        break;
+        $act = &Factory::newInstance('Split');
+        break;
+
       case 'standalone':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Standalone.php');
-        $act = new Standalone($this->db);
-        break;
+        $act = &Factory::newInstance('Standalone');
+        break;
+
       case 'view':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'View.php');
-        $act = new View($this->db);
-        break;
+        $act = &Factory::newInstance('View');
+        break;
+
       case 'switch':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'SwitchActivity.php');
-        $act = new SwitchActivity($this->db);
-        break;
+        $act = &Factory::newInstance('SwitchActivity');
+        break;
+
       case 'activity':
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Activity.php');
-        $act = new Activity($this->db);
-        break;
+        $act = &Factory::newInstance('Activity');
+        break;
+
       default:
         trigger_error('Unknown activity type:'.$res['wf_type'],E_USER_WARNING);
     }
-    
+
     $act->setName($res['wf_name']);
     $act->setProcessId($res['wf_p_id']);

trunk/workflow/inc/engine/src/API/Instance.php

@@ -1 +1 @@
 <?php
 require_once (GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'Base.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php');
 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');
 
@@ -141 +140 @@
 
   var $activityID = null;
-  function Instance($db) 
+  function Instance() 
   {
     $this->child_name = 'Instance';
-    parent::Base($db);
+    parent::Base();
   }
 
@@ -1171 +1170 @@
     
     //lock rows and ensure access is granted
-    if (!(isset($this->security))) $this->security =& new WfSecurity($this->db); 
+    if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity');
     if (!($this->security->checkUserAction($activityId,$this->instanceId,'complete')))
     {
@@ -1551 +1550 @@
     {
       //we check rights for this user on the next activity
-      if (!(isset($this->security))) $this->security =& new WfSecurity($this->db); 
+      if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity');
       if ($this->security->checkUserAccess($the_next_user,$activityId))
       {
@@ -1560 +1559 @@
     {
       // then check to see if there is a default user
-      $activity_manager =& new ActivityManager($this->db);
+      $activity_manager = &Factory::newInstance('ActivityManager');
       //get_default_user will give us '*' if there is no default_user or if the default user has no role
       //mapped anymore

trunk/workflow/inc/engine/src/API/Process.php

@@ -48 +48 @@
          * @access public
          */
-        function Process(&$db) 
+        function Process() 
         {
                 $this->child_name = 'Process';
-                parent::Base($db);
+                parent::Base();
         }
 

trunk/workflow/inc/engine/src/API/activities/Activity.php

@@ -16 +16 @@
          * @access public
          */
-        function Activity(&$db)
+        function Activity()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Activity';
         }

trunk/workflow/inc/engine/src/API/activities/End.php

@@ -15 +15 @@
          * @access public
          */
-        function End(&$db)
+        function End()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'End';
         }

trunk/workflow/inc/engine/src/API/activities/Join.php

@@ -15 +15 @@
          * @access public
          */
-        function Join(&$db)
+        function Join()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Join';
         }

trunk/workflow/inc/engine/src/API/activities/Split.php

@@ -15 +15 @@
          * @access public
          */
-        function Split(&$db)
+        function Split()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Split';
         }

trunk/workflow/inc/engine/src/API/activities/Standalone.php

@@ -15 +15 @@
          * @access public
          */
-        function Standalone(&$db)
+        function Standalone()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Standalone';
         }

trunk/workflow/inc/engine/src/API/activities/Start.php

@@ -15 +15 @@
          * @access public
          */
-        function Start(&$db)
+        function Start()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'Start';
         }

trunk/workflow/inc/engine/src/API/activities/SwitchActivity.php

@@ -16 +16 @@
          * @access public
          */
-        function SwitchActivity(&$db)
+        function SwitchActivity()
         {
-           parent::Base($db);
+           parent::Base();
            $this->child_name = 'Switch';
         }

trunk/workflow/inc/engine/src/API/activities/View.php

@@ -16 +16 @@
          * @access public
          */     
-        function View(&$db)
+        function View()
         {
-                parent::Base($db);
+                parent::Base();
                 $this->child_name = 'View';
         }