svn commit: r821643 [15/15] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/test/ applications/accounting/src/org/ofbiz/accounting/ applications/accounting/src/org/ofbiz/accounting/agreement/ applications/accounting/src/org/ofbiz...

[adrianc]

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java Mon Oct  5 00:08:27 2009
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericValue;
 
 /**
@@ -257,10 +257,10 @@
 
     /**
      * Returns the delegator being used by this workflow
-     * @return GenericDelegator used for this workflow
+     * @return Delegator used for this workflow
      * @throws WfException
      */
-    public GenericDelegator getDelegator() throws WfException;
+    public Delegator getDelegator() throws WfException;
 
 } // interface WfExecutionObjectOperations
 

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java Mon Oct  5 00:08:27 2009
@@ -22,7 +22,7 @@
 import java.util.Date;
 
 import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.workflow.client.WorkflowClient;
@@ -57,7 +57,7 @@
         return new WfActivityImpl(value, process);
     }
 
-    public static WfActivity getWfActivity(GenericDelegator delegator, String workEffortId) throws WfException {
+    public static WfActivity getWfActivity(Delegator delegator, String workEffortId) throws WfException {
         if (delegator == null) throw new WfException("The delegator object cannot be null");
         if (workEffortId == null) throw new WfException("The WorkEffort key cannot be null");
         return new WfActivityImpl(delegator, workEffortId);
@@ -75,7 +75,7 @@
         return new WfAssignmentImpl(activity, resource, fromDate, create);
     }
 
-    public static WfAssignment getWfAssignment(GenericDelegator delegator, String work, String party, String role, Timestamp from) throws WfException {
+    public static WfAssignment getWfAssignment(Delegator delegator, String work, String party, String role, Timestamp from) throws WfException {
         WfActivity act = getWfActivity(delegator, work);
         WfResource res = getWfResource(delegator, null, null, party, role);
         return getWfAssignment(act, res, from, false);
@@ -94,7 +94,7 @@
         return new WfProcessImpl(value, mgr);
     }
 
-    public static WfProcess getWfProcess(GenericDelegator delegator, String workEffortId) throws WfException {
+    public static WfProcess getWfProcess(Delegator delegator, String workEffortId) throws WfException {
         if (delegator == null) throw new WfException("The delegator object cannot be null");
         if (workEffortId == null) throw new WfException("The WorkEffort key cannot be null");
         WfProcess process = null;
@@ -123,7 +123,7 @@
 
     /**
      * Creates a new {@link WfProcessMgr} instance.
-     * @param delegator The GenericDelegator to use for this manager.
+     * @param delegator The Delegator to use for this manager.
      * @param pkg The Workflow Package ID.
      * @param pkver The Workflow Package Version.
      * @param pid The Workflow Process ID.
@@ -131,7 +131,7 @@
      * @return An instance of the WfProcessMgr Interface.
      * @throws WfException
      */
-    public static WfProcessMgr getWfProcessMgr(GenericDelegator delegator, String pkg, String pkver, String pid, String pver) throws WfException {
+    public static WfProcessMgr getWfProcessMgr(Delegator delegator, String pkg, String pkver, String pid, String pver) throws WfException {
         if (delegator == null) throw new WfException("Delegator cannot be null");
         if (pkg == null) throw new WfException("Workflow package id cannot be null.");
         if (pid == null) throw new WfException("Workflow process id cannot be null");
@@ -169,7 +169,7 @@
 
     /**
      * Creates a new {@link WfResource} instance.
-     * @param delegator The GenericDelegator for this instance
+     * @param delegator The Delegator for this instance
      * @param key The key for the resource
      * @param name The name of the resource
      * @param party The partyId of the resource
@@ -177,7 +177,7 @@
      * @return An instance of the WfResource Interface.
      * @throws WfException
      */
-    public static WfResource getWfResource(GenericDelegator delegator, String key, String name, String party, String role) throws WfException {
+    public static WfResource getWfResource(Delegator delegator, String key, String name, String party, String role) throws WfException {
         if (delegator == null) throw new WfException("Delegator cannot be null");
         if (party == null) party = "_NA_";
         if (role == null) role = "_NA_";

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java Mon Oct  5 00:08:27 2009
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.job.Job;
@@ -45,19 +45,19 @@
 
     public static final String module = WorkflowClient.class.getName();
 
-    protected GenericDelegator delegator = null;
+    protected Delegator delegator = null;
     protected LocalDispatcher dispatcher = null;
 
     protected WorkflowClient() {}
 
     /**
      * Get a new instance of the Workflow Client
-     * @param delegator the GenericDelegator object which matchs the delegator used by the workflow engine.
+     * @param delegator the Delegator object which matchs the delegator used by the workflow engine.
      * @param dispatcher a LocalDispatcher object to invoke the workflow services.
      */
-    public WorkflowClient(GenericDelegator delegator, LocalDispatcher dispatcher) {
+    public WorkflowClient(Delegator delegator, LocalDispatcher dispatcher) {
         if (delegator == null)
-            throw new IllegalArgumentException("GenericDelegator cannot be null");
+            throw new IllegalArgumentException("Delegator cannot be null");
         if (dispatcher == null)
             throw new IllegalArgumentException("LocalDispatcher cannot be null");
         this.delegator = delegator;

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java Mon Oct  5 00:08:27 2009
@@ -26,7 +26,7 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
@@ -56,7 +56,7 @@
     /** Cancel Workflow */
     public static Map cancelWorkflow(DispatchContext ctx, Map context) {
         Map result = new HashMap();
-        GenericDelegator delegator = ctx.getDelegator();
+        Delegator delegator = ctx.getDelegator();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
 
@@ -492,7 +492,7 @@
     /**
      * Returns the owner of the workflow.
      */
-    public static GenericValue getOwner(GenericDelegator delegator, String workEffortId) {
+    public static GenericValue getOwner(Delegator delegator, String workEffortId) {
         try {
             GenericValue we = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
 

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java Mon Oct  5 00:08:27 2009
@@ -35,6 +35,7 @@
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -49,18 +50,18 @@
  */
 public class XpdlReader {
 
-    protected GenericDelegator delegator = null;
+    protected Delegator delegator = null;
     protected List values = null;
 
     public static final String module = XpdlReader.class.getName();
 
-    public XpdlReader(GenericDelegator delegator) {
+    public XpdlReader(Delegator delegator) {
         this.delegator = delegator;
     }
 
     /** Imports an XPDL file at the given location and imports it into the
      * datasource through the given delegator */
-    public static void importXpdl(URL location, GenericDelegator delegator) throws DefinitionParserException {
+    public static void importXpdl(URL location, Delegator delegator) throws DefinitionParserException {
         List values = readXpdl(location, delegator);
 
         // attempt to start a transaction
@@ -88,7 +89,7 @@
     /** Gets an XML file from the specified location and reads it into
      * GenericValue objects from the given delegator and returns them in a
      * List; does not write to the database, just gets the entities. */
-    public static List readXpdl(URL location, GenericDelegator delegator) throws DefinitionParserException {
+    public static List readXpdl(URL location, Delegator delegator) throws DefinitionParserException {
         if (Debug.infoOn()) Debug.logInfo("Beginning XPDL File Parse: " + location.toString(), module);
 
         XpdlReader reader = new XpdlReader(delegator);

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Mon Oct  5 00:08:27 2009
@@ -34,7 +34,7 @@
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.util.EntityTypeUtil;
@@ -79,7 +79,7 @@
         init();
     }
 
-    public WfActivityImpl(GenericDelegator delegator, String workEffortId) throws WfException {
+    public WfActivityImpl(Delegator delegator, String workEffortId) throws WfException {
         super(delegator, workEffortId);
         if (activityId == null || activityId.length() == 0)
             throw new WfException("Execution object is not of type WfActivity");

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java Mon Oct  5 00:08:27 2009
@@ -34,7 +34,7 @@
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.serialize.SerializeException;
@@ -73,7 +73,7 @@
     protected String processVersion = null;
     protected String activityId = null;
     protected String workEffortId = null;
-    protected GenericDelegator delegator = null;
+    protected Delegator delegator = null;
     protected List history = null;
 
     public WfExecutionObjectImpl(GenericValue valueObject, String parentId) throws WfException {
@@ -90,7 +90,7 @@
         createRuntime(parentId);
     }
 
-    public WfExecutionObjectImpl(GenericDelegator delegator, String workEffortId) throws WfException {
+    public WfExecutionObjectImpl(Delegator delegator, String workEffortId) throws WfException {
         this.delegator = delegator;
         this.workEffortId = workEffortId;
         this.packageId = getRuntimeObject().getString("workflowPackageId");
@@ -507,7 +507,7 @@
     /**
      * @see org.ofbiz.workflow.WfExecutionObject#getDelegator()
      */
-    public GenericDelegator getDelegator() throws WfException {
+    public Delegator getDelegator() throws WfException {
         return delegator;
     }
 

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java Mon Oct  5 00:08:27 2009
@@ -30,7 +30,7 @@
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.service.GenericResultWaiter;
@@ -75,9 +75,9 @@
     }
 
     /**
-     * @see org.ofbiz.workflow.impl.WfExecutionObjectImpl#WfExecutionObjectImpl(org.ofbiz.entity.GenericDelegator, java.lang.String)
+     * @see org.ofbiz.workflow.impl.WfExecutionObjectImpl#WfExecutionObjectImpl(org.ofbiz.entity.Delegator, java.lang.String)
      */
-    public WfProcessImpl(GenericDelegator delegator, String workEffortId) throws WfException {
+    public WfProcessImpl(Delegator delegator, String workEffortId) throws WfException {
         super(delegator, workEffortId);
         if (activityId != null && activityId.length() > 0)
             throw new WfException("Execution object is not of type WfProcess.");

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java Mon Oct  5 00:08:27 2009
@@ -30,7 +30,7 @@
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.util.EntityUtil;
@@ -71,7 +71,7 @@
      * @param processVersion
      * @throws WfException
      */
-    public WfProcessMgrImpl(GenericDelegator delegator, String packageId, String packageVersion,
+    public WfProcessMgrImpl(Delegator delegator, String packageId, String packageVersion,
             String processId, String processVersion) throws WfException {
         Map finder = UtilMisc.toMap("packageId", packageId, "processId", processId);
         List order = UtilMisc.toList("-packageVersion", "-processVersion");
@@ -254,7 +254,7 @@
     }
 
     private void buildInitialContext() throws WfException {
-        GenericDelegator delegator = processDef.getDelegator();
+        Delegator delegator = processDef.getDelegator();
         this.initialContext = new HashMap();
         List dataFields = new ArrayList();
         try {

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java Mon Oct  5 00:08:27 2009
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.workflow.NotAssigned;
@@ -40,7 +40,7 @@
  */
 public class WfResourceImpl implements WfResource {
 
-    protected GenericDelegator delegator = null;
+    protected Delegator delegator = null;
     protected String resourceKey = null;
     protected String resourceName = null;
     protected String description = null;
@@ -56,7 +56,7 @@
      * @param roleTypeId The roleTypeId of this resource
      * @param fromDate The fromDate of this resource
      */
-    public WfResourceImpl(GenericDelegator delegator, String resourceKey, String resourceName, String partyId, String roleTypeId) {
+    public WfResourceImpl(Delegator delegator, String resourceKey, String resourceName, String partyId, String roleTypeId) {
         this.delegator = delegator;
         this.resourceKey = resourceKey;
         this.resourceName = resourceName;