[Erp5-report] r28253 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: luke
Date: Mon Aug  3 16:44:03 2009
New Revision: 28253

URL: http://svn.erp5.org?rev=28253&view=rev
Log:
 - naming convention fix: do not use abbreviations, be explicit in what method returns
 - put method to non overloadable group

Modified:
    erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
    erp5/trunk/products/ERP5/Document/BPMRule.py

Modified: erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py?rev=28253&r1=28252&r2=28253&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] Mon Aug  3 16:44:03 2009
@@ -82,7 +82,7 @@
 
     These previsions are actually returned as dictionaries.
     """
-    input_movement, business_path = self._getInputMovementAndPathList(
+    input_movement, business_path = self._getInputMovementAndPathTupleList(
         applied_rule)[0]
     prevision_list = []
 

Modified: erp5/trunk/products/ERP5/Document/BPMRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMRule.py?rev=28253&r1=28252&r2=28253&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] Mon Aug  3 16:44:03 2009
@@ -115,29 +115,29 @@
   # Solvers
   security.declareProtected( Permissions.AccessContentsInformation,
                             'isDivergent')
-  def isDivergent(self, sim_mvt, ignore_list=[]):
+  def isDivergent(self, simulation_movement, ignore_list=[]):
     """
     Returns true if the Simulation Movement is divergent comparing to
     the delivery value
     """
-    delivery = sim_mvt.getDeliveryValue()
+    delivery = simulation_movement.getDeliveryValue()
     if delivery is None:
       return 0
 
-    if self.getDivergenceList(sim_mvt) == []:
+    if self.getDivergenceList(simulation_movement) == []:
       return 0
     else:
       return 1
 
   security.declareProtected(Permissions.View, 'getDivergenceList')
-  def getDivergenceList(self, sim_mvt):
+  def getDivergenceList(self, simulation_movement):
     """
     Return a list of messages that contains the divergences.
     """
     result_list = []
     for divergence_tester in self.contentValues(
                portal_type=self.getPortalDivergenceTesterTypeList()):
-      result = divergence_tester.explain(sim_mvt)
+      result = divergence_tester.explain(simulation_movement)
       result_list.extend(result)
     return result_list
 
@@ -173,7 +173,52 @@
     This method might be overloaded"""
     return [applied_rule.getParentValue()]
 
-  def _getInputMovementAndPathList(self, applied_rule):
+  def _generatePrevisionList(self, applied_rule, **kw):
+    """
+    Generate a list of dictionaries, that contain calculated content of
+    current Simulation Movements in applied rule.
+    based on its context (parent movement, delivery, configuration ...)
+
+    These previsions are returned as dictionaries.
+    """
+    prevision_dict_list = []
+    for input_movement, business_path in self \
+        ._getInputMovementAndPathTupleList(applied_rule):
+      prevision_dict_list.append(self._getExpandablePropertyDict(applied_rule,
+          input_movement, business_path))
+    return prevision_dict_list
+
+#### Helpers NOT to overload
+  def _getCurrentMovementList(self, applied_rule, **kw):
+    """
+    Returns the list of current children of the applied rule, sorted in 3
+    groups : immutables/mutables/deletable
+
+     * immutable is frozen
+     * mutable is not frozen, but delivered
+     * deletable is not frozen and not delivered
+
+    Delivered means movement is delivered or any of its children is delivered.
+    """
+    immutable_movement_list = []
+    mutable_movement_list = []
+    deletable_movement_list = []
+
+    for movement in applied_rule.contentValues(
+        portal_type=self.movement_type):
+      if movement.isFrozen():
+        immutable_movement_list.append(movement)
+      else:
+        if movement._isTreeDelivered():
+          mutable_movement_list.append(movement)
+        else:
+          deletable_movement_list.append(movement)
+
+    return (immutable_movement_list, mutable_movement_list,
+            deletable_movement_list)
+
+  def _getInputMovementAndPathTupleList(self, applied_rule):
+    """Returns list of tuples (movement, business_path)"""
     input_movement_list = self._getInputMovementList(applied_rule)
     business_process = applied_rule.getBusinessProcessValue()
 
@@ -191,49 +236,6 @@
       raise NotImplementedError
 
     return input_movement_and_path_list
-
-  def _generatePrevisionList(self, applied_rule, **kw):
-    """
-    Generate a list of dictionaries, that contain calculated content of
-    current Simulation Movements in applied rule.
-    based on its context (parent movement, delivery, configuration ...)
-
-    These previsions are returned as dictionaries.
-    """
-    prevision_dict_list = []
-    for input_movement, business_path in self._getInputMovementAndPathList(applied_rule):
-      prevision_dict_list.append(self._getExpandablePropertyDict(applied_rule,
-          input_movement, business_path))
-    return prevision_dict_list
-
-#### Helpers NOT to overload
-  def _getCurrentMovementList(self, applied_rule, **kw):
-    """
-    Returns the list of current children of the applied rule, sorted in 3
-    groups : immutables/mutables/deletable
-
-     * immutable is frozen
-     * mutable is not frozen, but delivered
-     * deletable is not frozen and not delivered
-
-    Delivered means movement is delivered or any of its children is delivered.
-    """
-    immutable_movement_list = []
-    mutable_movement_list = []
-    deletable_movement_list = []
-
-    for movement in applied_rule.contentValues(
-        portal_type=self.movement_type):
-      if movement.isFrozen():
-        immutable_movement_list.append(movement)
-      else:
-        if movement._isTreeDelivered():
-          mutable_movement_list.append(movement)
-        else:
-          deletable_movement_list.append(movement)
-
-    return (immutable_movement_list, mutable_movement_list,
-            deletable_movement_list)
 
   def _getCompensatedMovementList(self, applied_rule, **kw):
     """