OFBiz › OFBiz - Commits

svn commit: r932317 [1/3] - in /ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow: ./ client/ definition/ impl/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r932317 [1/3] - in /ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow: ./ client/ definition/ impl/

jleroux@apache.org
Author: jleroux
Date: Fri Apr  9 09:40:02 2010
New Revision: 932317

URL: http://svn.apache.org/viewvc?rev=932317&view=rev
Log:
A patch from Bob Morley "Resolve java warnings exposed in Eclipse (specialpurpose - workflow part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3602 - OFBIZ-3602

I replaced a bunch of tabs and also remove ref. to Oswin Ondarza


Modified:
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityAbstractImplementation.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java
    ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * AlreadyRunning Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class AlreadyRunning extends WfException {
 
     public AlreadyRunning() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * AlreadySuspended Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class AlreadySuspended extends WfException {
 
     public AlreadySuspended() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotChangeRequester Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotChangeRequester extends WfException {
 
     public CannotChangeRequester() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotComplete Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotComplete extends WfException {
 
     public CannotComplete() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotResume Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotResume extends WfException {
 
     public CannotResume() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotStart Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotStart extends WfException {
 
     public CannotStart() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotStop Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotStop extends WfException {
 
     public CannotStop() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * CannotSuspend Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class CannotSuspend extends WfException {
 
     public CannotSuspend() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * Transition Evaluation Workflow Exception
  */
+@SuppressWarnings("serial")
 public class EvaluationException extends WfException {
 
     public EvaluationException() {

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * HistoryNotAvailable Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class HistoryNotAvailable extends WfException {
 
     public HistoryNotAvailable() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * InvalidData Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class InvalidData extends WfException {
 
     public InvalidData() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * InvalidPerformer Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class InvalidPerformer extends WfException {
 
     public InvalidPerformer() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * InvalidRequester Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class InvalidRequester extends WfException {
 
     public InvalidRequester() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * InvalidResource Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class InvalidResource extends WfException {
 
     public InvalidResource() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * InvalidState Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class InvalidState extends WfException {
 
     public InvalidState() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * NotAssigned Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class NotAssigned extends WfException {
 
     public NotAssigned() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * NotEnabled Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class NotEnabled extends WfException {
 
     public NotEnabled() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * NotRunning Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class NotRunning extends WfException {
 
     public NotRunning() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * NotSuspended Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class NotSuspended extends WfException {
 
     public NotSuspended() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * RequesterRequired Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class RequesterRequired extends WfException {
 
     public RequesterRequired() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * ResultNotAvailable Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class ResultNotAvailable extends WfException {
 
     public ResultNotAvailable() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * SourceNotAvailable Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class SourceNotAvailable extends WfException {
 
     public SourceNotAvailable() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java Fri Apr  9 09:40:02 2010
@@ -36,6 +36,6 @@ public interface TransitionCondition {
      * @return The result of the evaluation
      * @throws EvaluationException
      */
-    public Boolean evaluateCondition(Map context, Map attrs, String expression, DispatchContext dctx) throws EvaluationException;
+    public Boolean evaluateCondition(Map<String, Object> context, Map<String, String> attrs, String expression, DispatchContext dctx) throws EvaluationException;
 
 }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * TransitionNotAllowed Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class TransitionNotAllowed extends WfException {
 
     public TransitionNotAllowed() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * UpdateNotAllowed Workflow Exception
  */
+@SuppressWarnings("serial")
 public final class UpdateNotAllowed extends WfException {
 
     public UpdateNotAllowed() {}

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java Fri Apr  9 09:40:02 2010
@@ -39,7 +39,7 @@ public interface WfActivity extends WfEx
      * @throws WfException General workflow exception.
      * @return Assignment Iterator.
      */
-    public Iterator getIteratorAssignment() throws WfException;
+    public Iterator<WfAssignment> getIteratorAssignment() throws WfException;
 
     /**
      * Retrieve all assignments of this activity.
@@ -47,7 +47,7 @@ public interface WfActivity extends WfEx
      * @throws WfException General workflow exception.
      * @return  List of WfAssignment objects.
      */
-    public List getSequenceAssignment(int maxNumber) throws WfException;
+    public List<WfAssignment> getSequenceAssignment(int maxNumber) throws WfException;
 
     /**
      * Check if a specific assignment is a member of this activity.
@@ -70,7 +70,7 @@ public interface WfActivity extends WfEx
      * @throws ResultNotAvailable No result is available.
      * @return Map of results from this activity
      */
-    public Map result() throws WfException, ResultNotAvailable;
+    public Map<String, Object> result() throws WfException, ResultNotAvailable;
 
     /**
      * Assign Result for this activity.
@@ -78,7 +78,7 @@ public interface WfActivity extends WfEx
      * @throws WfException General workflow exception.
      * @throws InvalidData Data is invalid
      */
-    public void setResult(Map result) throws WfException, InvalidData;
+    public void setResult(Map<String, Object> result) throws WfException, InvalidData;
 
     /**
      * Complete this activity.

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Fri Apr  9 09:40:02 2010
@@ -20,11 +20,8 @@ package org.ofbiz.workflow;
 
 import java.io.IOException;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +30,7 @@ import javax.xml.parsers.ParserConfigura
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -67,9 +65,9 @@ public class WfApplicationServices {
      * @throws GenericServiceException
      * @return Empty result
      */
-    public static Map activateApplication(DispatchContext ctx, Map context) {
+    public static Map<String, Object> activateApplication(DispatchContext ctx, Map<String, Object> context) {
         final String workEffortId = (String) context.get("workEffortId");
-        final Map result = new HashMap();
+        final Map<String, Object> result = new HashMap<String, Object>();
 
         try {
             final GenericValue weAssigment = getWorkEffortPartyAssigment(ctx.getDelegator(), workEffortId);
@@ -89,9 +87,9 @@ public class WfApplicationServices {
         return result;
     }
 
-    public static Map getApplicationContext(DispatchContext ctx, Map context) throws GenericServiceException {
+    public static Map<String, Object> getApplicationContext(DispatchContext ctx, Map<String, Object> context) throws GenericServiceException {
         final Delegator delegator = ctx.getDelegator();
-        final Map result = new HashMap();
+        final Map<String, Object> result = new HashMap<String, Object>();
         try {
             result.put("applicationContext",
                     getRunTimeContext(delegator, getRuntimeData(delegator, (String) context.get("applicationId"))));
@@ -104,34 +102,35 @@ public class WfApplicationServices {
         return result;
     }
 
-    public static Map completeApplication(DispatchContext ctx, Map context) throws GenericServiceException {
+    public static Map<String, Object> completeApplication(DispatchContext ctx, Map<String, Object> context) throws GenericServiceException {
         final Delegator delegator = ctx.getDelegator();
         final String applicationId = (String) context.get("applicationId");
-        final Map result = new HashMap();
+        final Map<String, Object> result = new HashMap<String, Object>();
 
         GenericValue application = getApplicationSandbox(delegator, applicationId);
         GenericValue runTimeData = getRuntimeData(delegator, applicationId);
-        Map runTimeContext = getRunTimeContext(delegator, runTimeData);
-        Map contextSignature = new HashMap();
-        Map resultSignature = new HashMap();
-        Map resultContext = new HashMap();
-        Map runContext = new HashMap(context);
+        Map<String, Object> runTimeContext = getRunTimeContext(delegator, runTimeData);
+        Map<String, Object> contextSignature = new HashMap<String, Object>();
+        Map<String, Object> resultSignature = new HashMap<String, Object>();
+        Map<String, Object> resultContext = new HashMap<String, Object>();
+        Map<String, Object> runContext = new HashMap<String, Object>(context);
 
         try {
             // copy all OUT & INOUT formal parameters
             getApplicationSignatures(delegator, application, contextSignature, resultSignature);
-            for (Iterator names = resultSignature.keySet().iterator(); names.hasNext();) {
-                String name = (String) names.next();
+            for (String name : resultSignature.keySet()) {
                 Object value = null;
                 if (runTimeContext.containsKey(name)
                     && contextSignature.containsKey(name)
                     && resultSignature.containsKey(name))
                     value = runTimeContext.get(name);
-                if (((Map) context.get("result")).containsKey(name))
-                    value = ((Map) context.get("result")).get(name);
-                if (value != null)
+                if (UtilGenerics.checkMap(context.get("result")).containsKey(name)) {
+                    value = UtilGenerics.checkMap(context.get("result")).get(name);
+                }
+                if (value != null) {
                     resultContext.put(name,
                             ObjectType.simpleTypeConvert(value, (String) resultSignature.get(name), null, null));
+                }
             }
             runTimeContext.putAll(resultContext);
             // fin de agregar
@@ -143,7 +142,6 @@ public class WfApplicationServices {
             }
 
             setRunTimeContext(runTimeData, runTimeContext);
-            // agregado por Oswin Ondarza
 
             runContext.remove("applicationId");
 
@@ -176,7 +174,7 @@ public class WfApplicationServices {
     }
 
     private static String insertAppSandbox(Delegator delegator, String workEffortId, String partyId,
-            String roleTypeId, Timestamp fromDate, Map context) throws GenericServiceException {
+            String roleTypeId, Timestamp fromDate, Map<String, Object> context) throws GenericServiceException {
         String dataId = null;
         String applicationId = Long.toString((new Date().getTime()));
 
@@ -192,7 +190,7 @@ public class WfApplicationServices {
         } catch (IOException ioe) {
             throw new GenericServiceException(ioe.getMessage(), ioe);
         }
-        Map aFields = UtilMisc.toMap("applicationId", applicationId, "workEffortId", workEffortId,
+        Map<String, Object> aFields = UtilMisc.toMap("applicationId", applicationId, "workEffortId", workEffortId,
                 "partyId", partyId, "roleTypeId", roleTypeId, "fromDate", fromDate, "runtimeDataId", dataId);
 
         GenericValue appV = null;
@@ -216,10 +214,10 @@ public class WfApplicationServices {
         }
     }
 
-    private static Map getRunTimeContext(Delegator delegator, GenericValue runTimeData)
+    private static Map<String, Object> getRunTimeContext(Delegator delegator, GenericValue runTimeData)
             throws GenericServiceException {
         try {
-            return (Map) XmlSerializer.deserialize((String) runTimeData.get("runtimeInfo"), delegator);
+            return UtilGenerics.checkMap(XmlSerializer.deserialize((String) runTimeData.get("runtimeInfo"), delegator));
         } catch (SerializeException se) {
             throw new GenericServiceException(se.getMessage(), se);
         } catch (ParserConfigurationException pe) {
@@ -231,7 +229,7 @@ public class WfApplicationServices {
         }
     }
 
-    private static void setRunTimeContext(GenericValue runTimeData, Map context) throws GenericServiceException {
+    private static void setRunTimeContext(GenericValue runTimeData, Map<String, Object> context) throws GenericServiceException {
         try {
             runTimeData.set("runtimeInfo", XmlSerializer.serialize(context));
             runTimeData.store();
@@ -256,8 +254,8 @@ public class WfApplicationServices {
     }
 
     private static void getApplicationSignatures(Delegator delegator, GenericValue application,
-            Map contextSignature, Map resultSignature) throws GenericEntityException {
-        Map expresions = null;
+            Map<String, Object> contextSignature, Map<String, Object> resultSignature) throws GenericEntityException {
+        Map<String, Object> expresions = null;
         // look for the 1st application.
         final GenericValue workEffort =
             delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", application.get("workEffortId")));
@@ -267,14 +265,14 @@ public class WfApplicationServices {
         String processVersion = (String) workEffort.get("workflowProcessVersion");
         String activityId = (String) workEffort.get("workflowActivityId");
 
-        expresions = new HashMap();
+        expresions = new HashMap<String, Object>();
         expresions.putAll(UtilMisc.toMap("packageId", packageId));
         expresions.putAll(UtilMisc.toMap("packageVersion", packageVersion));
         expresions.putAll(UtilMisc.toMap("processId", processId));
         expresions.putAll(UtilMisc.toMap("processVersion", processVersion));
         expresions.putAll(UtilMisc.toMap("activityId", activityId));
 
-        final Collection wfActivityTools = delegator.findByAnd("WorkflowActivityTool", expresions);
+        final List<GenericValue> wfActivityTools = delegator.findByAnd("WorkflowActivityTool", expresions);
         final GenericValue wfActivityTool = (GenericValue) wfActivityTools.toArray()[0];
 
         packageId = (String) wfActivityTool.get("packageId");
@@ -283,18 +281,16 @@ public class WfApplicationServices {
         processVersion = (String) wfActivityTool.get("processVersion");
         final String applicationId = (String) wfActivityTool.get("toolId");
 
-        expresions = new HashMap();
+        expresions = new HashMap<String, Object>();
         expresions.putAll(UtilMisc.toMap("packageId", packageId));
         expresions.putAll(UtilMisc.toMap("packageVersion", packageVersion));
         expresions.putAll(UtilMisc.toMap("processId", processId));
         expresions.putAll(UtilMisc.toMap("processVersion", processVersion));
         expresions.putAll(UtilMisc.toMap("applicationId", applicationId));
 
-        final Collection params = delegator.findByAnd("WorkflowFormalParam", expresions);
+        final List<GenericValue> params = delegator.findByAnd("WorkflowFormalParam", expresions);
 
-        Iterator i = params.iterator();
-        while (i.hasNext()) {
-            GenericValue param = (GenericValue) i.next();
+        for (GenericValue param : params) {
             String name = param.getString("formalParamId");
             String mode = param.getString("modeEnumId");
             String type = param.getString("dataTypeEnumId");
@@ -307,14 +303,13 @@ public class WfApplicationServices {
 
     private static GenericValue getWorkEffortPartyAssigment(Delegator delegator, String workEffortId)
             throws GenericServiceException {
-        Map expresions = new HashMap();
+        Map<String, Object> expresions = new HashMap<String, Object>();
         expresions.putAll(UtilMisc.toMap("workEffortId", workEffortId));
         expresions.putAll(UtilMisc.toMap("statusId", "CAL_ACCEPTED"));
-        List orderBy = new ArrayList();
-        orderBy.add("-fromDate");
+        List<String> orderBy = UtilMisc.toList("-fromDate");
 
         try {
-            final Collection assigments = delegator.findByAnd("WorkEffortPartyAssignment", expresions, orderBy);
+            final List<GenericValue> assigments = delegator.findByAnd("WorkEffortPartyAssignment", expresions, orderBy);
             if (assigments.isEmpty()) {
                 Debug.logError("No accepted activities found for the workEffortId=" + workEffortId, module);
                 throw new GenericServiceException("Can not find WorkEffortPartyAssignment for the Workflow service. WorkEffortId=" + workEffortId);

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java Fri Apr  9 09:40:02 2010
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package org.ofbiz.workflow;
 
+import java.util.Map;
+
 /**
  * WfAssignment - Workflow Assignment Interface
  */
@@ -63,7 +65,7 @@ public interface WfAssignment {
      * @param Map The results of the assignement.
      * @throws WfException
      */
-    public void setResult(java.util.Map results) throws WfException;
+    public void setResult(Map<String, Object> results) throws WfException;
 
     /**
      * Mark this assignment as complete.

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java Fri Apr  9 09:40:02 2010
@@ -29,12 +29,12 @@ public interface WfDataEventAudit {
      * @throws WfException
      * @return
      */
-    public Map oldData() throws WfException;
+    public Map<String, Object> oldData() throws WfException;
 
     /**
      * @throws WfException
      * @return
      */
-    public Map newData() throws WfException;
+    public Map<String, Object> newData() throws WfException;
 
 } // interface WfDataEventAuditOperations

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow;
 /**
  * WfException - Generic Workflow Exception
  */
+@SuppressWarnings("serial")
 public class WfException extends org.ofbiz.base.util.GeneralException {
 
     /**

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=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java Fri Apr  9 09:40:02 2010
@@ -35,32 +35,32 @@ public interface WfExecutionObject {
      * @throws WfException General workflow exception.
      * @return Current state of this object.
      */
-    public List workflowStateType() throws WfException;
+    public List<String> workflowStateType() throws WfException;
 
     /**
      * @throws WfException General workflow exception.
      * @return
      */
-    public List whileOpenType() throws WfException;
+    public List<String> whileOpenType() throws WfException;
 
     /**
      * @throws WfException General workflow exception.
      * @return Reason for not running.
      */
-    public List whyNotRunningType() throws WfException;
+    public List<String> whyNotRunningType() throws WfException;
 
     /**
      * @throws WfException General workflow exception.
      * @return Termination art of this process ot activity.
      */
-    public List howClosedType() throws WfException;
+    public List<String> howClosedType() throws WfException;
 
     /**
      * Retrieve the list of all valid states.
      * @throws WfException General workflow exception.
      * @return List of valid states.
      */
-    public List validStates() throws WfException;
+    public List<String> validStates() throws WfException;
 
     /**
      * Retrieve the current state of this process or activity.
@@ -124,7 +124,7 @@ public interface WfExecutionObject {
      * @throws WfException General workflow exception.
      * @return Process context.
      */
-    public Map processContext() throws WfException;
+    public Map<String, Object> processContext() throws WfException;
 
     /**
      * Set the process context
@@ -133,7 +133,7 @@ public interface WfExecutionObject {
      * @throws InvalidData The data is invalid.
      * @throws UpdateNotAllowed Update the context is not allowed.
      */
-    public void setProcessContext(Map newValue) throws WfException, InvalidData, UpdateNotAllowed;
+    public void setProcessContext(Map<String, Object> newValue) throws WfException, InvalidData, UpdateNotAllowed;
 
     /**
      * Set the process context (with previously stored data)
@@ -215,7 +215,7 @@ public interface WfExecutionObject {
      * @throws HistoryNotAvailable
      * @return Found history elements that meet the search criteria.
      */
-    public Iterator getIteratorHistory(String query, java.util.Map namesInQuery) throws WfException, HistoryNotAvailable;
+    public Iterator<?> getIteratorHistory(String query, java.util.Map<String, Object> namesInQuery) throws WfException, HistoryNotAvailable;
 
     /**
      * Getter for history sequence.
@@ -224,7 +224,7 @@ public interface WfExecutionObject {
      * @throws HistoryNotAvailable
      * @return List of History objects.
      */
-    public List getSequenceHistory(int maxNumber) throws WfException, HistoryNotAvailable;
+    public List<?> getSequenceHistory(int maxNumber) throws WfException, HistoryNotAvailable;
 
     /**
      * Predicate to check if a 'member' is an element of the history.

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=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java Fri Apr  9 09:40:02 2010
@@ -41,8 +41,8 @@ public class WfFactory {
 
     public static final String module = WfFactory.class.getName();
 
-    protected static UtilCache wfProcessMgrCache = UtilCache.createUtilCache("workflow.processmgr");
-    protected static UtilCache wfClientCache = UtilCache.createUtilCache("workflow.client");
+    protected static UtilCache<String, WfProcessMgrImpl> wfProcessMgrCache = UtilCache.createUtilCache("workflow.processmgr");
+    protected static UtilCache<DispatchContext, WorkflowClient> wfClientCache = UtilCache.createUtilCache("workflow.client");
 
     /**
      * Creates a new {@link WfActivity} instance.

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java Fri Apr  9 09:40:02 2010
@@ -52,14 +52,14 @@ public interface WfProcess extends WfExe
      * @throws WfException
      * @return
      */
-    public Iterator getIteratorStep() throws WfException;
+    public Iterator<WfActivity> getIteratorStep() throws WfException;
 
     /**
      * @param maxNumber
      * @throws WfException
      * @return List of WfActivity objects.
      */
-    public List getSequenceStep(int maxNumber) throws WfException;
+    public List<WfActivity> getSequenceStep(int maxNumber) throws WfException;
 
     /**
      * @param member
@@ -81,7 +81,7 @@ public interface WfProcess extends WfExe
      * @throws ResultNotAvailable
      * @return result Map of results from this process
      */
-    public Map result() throws WfException, ResultNotAvailable;
+    public Map<String, Object> result() throws WfException, ResultNotAvailable;
 
     /**
      * Receives activity results.
@@ -89,7 +89,7 @@ public interface WfProcess extends WfExe
      * @param results Map of the results.
      * @throws WfException
      */
-    public void receiveResults(WfActivity activity, Map results) throws WfException;
+    public void receiveResults(WfActivity activity, Map<String, Object> results) throws WfException;
 
     /**
      * Receives notification when an activity has completed.
@@ -121,6 +121,6 @@ public interface WfProcess extends WfExe
      * @throws InvalidState
      * @return
      */
-    public Iterator getActivitiesInState(String state) throws WfException, InvalidState;
+    public Iterator<WfActivity> getActivitiesInState(String state) throws WfException, InvalidState;
 
 } // interface WfProcessOperations

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java Fri Apr  9 09:40:02 2010
@@ -37,14 +37,14 @@ public interface WfProcessMgr {
      * @throws WfException
      * @return
      */
-    public Iterator getIteratorProcess() throws WfException;
+    public Iterator<WfProcess> getIteratorProcess() throws WfException;
 
     /**
      * @param maxNumber
      * @throws WfException
      * @return List of WfProcess objects.
      */
-    public List getSequenceProcess(int maxNumber) throws WfException;
+    public List<WfProcess> getSequenceProcess(int maxNumber) throws WfException;
 
     /**
      * @param member
@@ -57,7 +57,7 @@ public interface WfProcessMgr {
      * @throws WfException
      * @return
      */
-    public List processMgrStateType() throws WfException;
+    public List<String> processMgrStateType() throws WfException;
 
     /**
      * @param newState
@@ -94,19 +94,19 @@ public interface WfProcessMgr {
      * @throws WfException
      * @return
      */
-    public Map contextSignature() throws WfException;
+    public Map<String, Object> contextSignature() throws WfException;
 
     /**
      * @throws WfException
      * @return
      */
-    public Map resultSignature() throws WfException;
+    public Map<String, Object> resultSignature() throws WfException;
 
     /**
     * @throws WfException
     * @return initial context based on DataFields
     */
-    public Map getInitialContext() throws WfException;
+    public Map<String, Object> getInitialContext() throws WfException;
 
     /**
      * Create a WfProcess object

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java Fri Apr  9 09:40:02 2010
@@ -40,7 +40,7 @@ public interface WfRequester {
      * @throws WfException
      * @return Iterator of workflow processes.
      */
-    public Iterator getIteratorPerformer() throws WfException;
+    public Iterator<WfProcess> getIteratorPerformer() throws WfException;
 
     /**
      * A list of processes
@@ -48,7 +48,7 @@ public interface WfRequester {
      * @throws WfException
      * @return List of WfProcess objects.
      */
-    public List getSequencePerformer(int maxNumber) throws WfException;
+    public List<WfProcess> getSequencePerformer(int maxNumber) throws WfException;
 
     /**
      * Checks if a WfProcess is associated with this requester object
@@ -65,7 +65,7 @@ public interface WfRequester {
      *@param requester associated with the service
      *@throws WfException
      */
-    public void registerProcess(WfProcess process, Map context, GenericRequester requester) throws WfException;
+    public void registerProcess(WfProcess process, Map<String, Object> context, GenericRequester requester) throws WfException;
 
     /**
      * Receives notice of event status changes

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java Fri Apr  9 09:40:02 2010
@@ -38,7 +38,7 @@ public interface WfResource {
      * @throws WfException
      * @return Iterator of work items
      */
-    public Iterator getIteratorWorkItem() throws WfException;
+    public Iterator<WfActivity> getIteratorWorkItem() throws WfException;
 
     /**
      * Gets the work items
@@ -46,7 +46,7 @@ public interface WfResource {
      * @throws WfException
      * @return List of WfAssignment objects.
      */
-    public List getSequenceWorkItem(int maxNumber) throws WfException;
+    public List<WfActivity> getSequenceWorkItem(int maxNumber) throws WfException;
 
     /**
      * Checks if an assignment object is associated with this resource

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java Fri Apr  9 09:40:02 2010
@@ -27,7 +27,7 @@ import org.ofbiz.base.util.UtilMisc;
  */
 public final class WfUtil {
 
-    private static final Map typeMap = UtilMisc.toMap("WDT_BOOLEAN", "java.lang.Boolean",
+    private static final Map<String, String> typeMap = UtilMisc.toMap("WDT_BOOLEAN", "java.lang.Boolean",
         "WDT_STRING", "java.lang.String", "WDT_INTEGER", "java.lang.Long",
         "WDT_FLOAT", "java.lang.Double", "WDT_DATETIME", "java.sql.Timestamp");
 

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java Fri Apr  9 09:40:02 2010
@@ -56,7 +56,7 @@ public class WorkflowEngine extends Abst
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
      */
-    public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException {
+    public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         GenericResultWaiter waiter = new GenericResultWaiter();
         runAsync(localName, modelService, context, waiter, false);
         return waiter.waitForResult();
@@ -65,21 +65,21 @@ public class WorkflowEngine extends Abst
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
      */
-    public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException {
+    public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         runAsync(localName, modelService, context, null, false);
     }
 
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, boolean)
      */
-    public void runAsync(String localName, ModelService modelService, Map context, boolean persist) throws GenericServiceException {
+    public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException {
         runAsync(localName, modelService, context, null, persist);
     }
 
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, org.ofbiz.service.GenericRequester, boolean)
      */
-    public void runAsync(String localName, ModelService modelService, Map context, GenericRequester requester, boolean persist) throws GenericServiceException {
+    public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException {
         Transaction parentTrans = null;
         boolean beganTransaction = false;
         try {
@@ -172,7 +172,7 @@ public class WorkflowEngine extends Abst
             if (context.containsKey("userLogin")) {
                 userLogin = (GenericValue) context.remove("userLogin");
                 try {
-                    Map fields = UtilMisc.toMap("partyId", userLogin.getString("partyId"),
+                    Map<String, Object> fields = UtilMisc.toMap("partyId", userLogin.getString("partyId"),
                             "roleTypeId", "WF_OWNER", "workEffortId", process.runtimeKey(),
                             "fromDate", UtilDateTime.nowTimestamp());
 
@@ -209,7 +209,7 @@ public class WorkflowEngine extends Abst
             try {
                 req.registerProcess(process, context, requester);
                 if (userLogin != null) {
-                    Map pContext = process.processContext();
+                    Map<String, Object> pContext = process.processContext();
                     pContext.put("workflowOwnerId", userLogin.getString("userLoginId"));
                     process.setProcessContext(pContext);
                 }
@@ -225,7 +225,7 @@ public class WorkflowEngine extends Abst
             // Set the initial locale - (in context)
             if (locale != null) {
                 try {
-                    Map pContext = process.processContext();
+                    Map<String, Object> pContext = process.processContext();
                     pContext.put("initialLocale", locale);
                     process.setProcessContext(pContext);
                 } catch (WfException wfe) {
@@ -277,12 +277,13 @@ public class WorkflowEngine extends Abst
             if (position == 1)
                 return null;
         }
-        List splitList = StringUtil.split(splitString, "::");
-        return (String) splitList.get(position);
+        List<String> splitList = StringUtil.split(splitString, "::");
+        return splitList.get(position);
     }
 }
 
 /** Workflow Runner class runs inside its own thread using the Scheduler API */
+@SuppressWarnings("serial")
 class WorkflowRunner extends AbstractJob {
 
     GenericRequester requester;

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java Fri Apr  9 09:40:02 2010
@@ -29,6 +29,7 @@ import org.ofbiz.workflow.WfActivity;
 /**
  * Workflow Client API - Start Activity Async-Job
  */
+@SuppressWarnings("serial")
 public class StartActivityJob extends AbstractJob {
 
     public static final String module = StartActivityJob.class.getName();
@@ -61,7 +62,7 @@ public class StartActivityJob extends Ab
             Debug.logVerbose("Executing job now : " + activity, module);
             activity.activate();
             if (requester != null)
-                requester.receiveResult(new HashMap());
+                requester.receiveResult(new HashMap<String, Object>());
         } catch (Exception e) {
             Debug.logError(e, "Start Activity [" + activity + "] Failed", module);
             if (requester != null)

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=932317&r1=932316&r2=932317&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 Fri Apr  9 09:40:02 2010
@@ -88,10 +88,9 @@ public class WorkflowClient {
         WfResource resource = WfFactory.getWfResource(delegator, null, null, partyId, roleTypeId);
 
         if (!append) {
-            Iterator i = activity.getIteratorAssignment();
-
+            Iterator<WfAssignment> i = activity.getIteratorAssignment();
             while (i.hasNext()) {
-                WfAssignment a = (WfAssignment) i.next();
+                WfAssignment a = i.next();
                 a.remove();
             }
         }
@@ -146,8 +145,8 @@ public class WorkflowClient {
             throw new WfException("This activity cannot be delegated once it has been started");
 
         if (fromPartyId == null && fromRoleTypeId == null && fromFromDate == null) {
-            Iterator i = activity.getIteratorAssignment();
-            fromAssign = (WfAssignment) i.next();
+            Iterator<WfAssignment> i = activity.getIteratorAssignment();
+            fromAssign = i.next();
             if (i.hasNext()) {
                 throw new WfException("Cannot locate the assignment to delegate from, there is more then one " +
                         "assignment for this activity.");
@@ -250,7 +249,7 @@ public class WorkflowClient {
      * @return GenericResultWaiter for the complete job.
      * @throws WfException
      */
-    public void complete(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map result) throws WfException {
+    public void complete(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map<String, Object> result) throws WfException {
         WfAssignment assign = WfFactory.getWfAssignment(delegator, workEffortId, partyId, roleTypeId, fromDate);
         if (UtilValidate.isNotEmpty(result))
             assign.setResult(result);
@@ -303,11 +302,11 @@ public class WorkflowClient {
      * @param append The data to append.
      * @throws WfException
      */
-    public void appendContext(String workEffortId, Map append) throws WfException {
+    public void appendContext(String workEffortId, Map<String, Object> append) throws WfException {
         WfExecutionObject obj = getExecutionObject(workEffortId);
 
         if (obj != null) {
-            Map oCtx = obj.processContext();
+            Map<String, Object> oCtx = obj.processContext();
 
             oCtx.putAll(append);
             obj.setProcessContext(oCtx);
@@ -320,7 +319,7 @@ public class WorkflowClient {
      * @param workEffortId The WorkEffort entity key for the execution object.
      * @throws WfException
      */
-    public Map getContext(String workEffortId) throws WfException {
+    public Map<String, Object> getContext(String workEffortId) throws WfException {
         WfExecutionObject obj = getExecutionObject(workEffortId);
 
         if (obj == null) throw new WfException("Invalid Execution Object (null value)");
@@ -402,11 +401,6 @@ public class WorkflowClient {
     }
 
     // Test an activity for running state.
-    private boolean activityRunning(String workEffortId) throws WfException {
-        return activityRunning(WfFactory.getWfActivity(delegator, workEffortId));
-    }
-
-    // Test an activity for running state.
     private boolean activityRunning(WfActivity activity) throws WfException {
         if (activity.state().equals("open.running"))
             return true;

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=932317&r1=932316&r2=932317&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 Fri Apr  9 09:40:02 2010
@@ -19,14 +19,15 @@
 package org.ofbiz.workflow.client;
 
 import java.sql.Timestamp;
-import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
@@ -57,8 +58,8 @@ public class WorkflowServices {
     // -------------------------------------------------------------------
 
     /** Cancel Workflow */
-    public static Map cancelWorkflow(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> cancelWorkflow(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = ctx.getDelegator();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
@@ -105,8 +106,8 @@ public class WorkflowServices {
     }
 
     /** Suspend activity */
-    public static Map suspendActivity(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> suspendActivity(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
 
@@ -130,8 +131,8 @@ public class WorkflowServices {
     }
 
     /** Resume activity */
-    public static Map resumeActivity(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> resumeActivity(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
 
@@ -155,8 +156,8 @@ public class WorkflowServices {
     }
 
     /** Change the state of an activity */
-    public static Map changeActivityState(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> changeActivityState(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
         String newState = (String) context.get("newState");
@@ -181,8 +182,8 @@ public class WorkflowServices {
     }
 
     /** Check the state of an activity */
-    public static Map checkActivityState(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> checkActivityState(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
 
         try {
@@ -198,8 +199,8 @@ public class WorkflowServices {
     }
 
     /** Get the current activity context */
-    public static Map getActivityContext(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> getActivityContext(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
 
         try {
@@ -215,11 +216,11 @@ public class WorkflowServices {
     }
 
     /** Appends data to the activity context */
-    public static Map appendActivityContext(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> appendActivityContext(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
-        Map appendContext = (Map) context.get("currentContext");
+        Map<String, Object> appendContext = UtilGenerics.checkMap(context.get("currentContext"));
 
         if (UtilValidate.isEmpty(appendContext)) {
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
@@ -246,8 +247,8 @@ public class WorkflowServices {
     }
 
     /** Assign activity to a new or additional party */
-    public static Map assignActivity(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> assignActivity(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
         String partyId = (String) context.get("partyId");
@@ -278,8 +279,8 @@ public class WorkflowServices {
     }
 
     /** Accept an assignment and attempt to start the activity */
-    public static Map acceptAssignment(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> acceptAssignment(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
         String partyId = (String) context.get("partyId");
         String roleType = (String) context.get("roleTypeId");
@@ -299,8 +300,8 @@ public class WorkflowServices {
     }
 
     /** Delegate an assignment */
-    public static Map delegateAssignment(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> delegateAssignment(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
         String fromParty = (String) context.get("fromPartyId");
         String fromRole = (String) context.get("fromRoleTypeId");
@@ -326,8 +327,8 @@ public class WorkflowServices {
     }
 
     /** Delegate, accept an assignment */
-    public static Map delegateAcceptAssignment(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> delegateAcceptAssignment(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
         String fromParty = (String) context.get("fromPartyId");
         String fromRole = (String) context.get("fromRoleTypeId");
@@ -359,8 +360,8 @@ public class WorkflowServices {
     }
 
     /** Accept a role assignment and attempt to start the activity */
-    public static Map acceptRoleAssignment(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> acceptRoleAssignment(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         String workEffortId = (String) context.get("workEffortId");
         String partyId = (String) context.get("partyId");
         String roleType = (String) context.get("roleTypeId");
@@ -379,14 +380,14 @@ public class WorkflowServices {
     }
 
     /** Complete an assignment */
-    public static Map completeAssignment(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> completeAssignment(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         Security security = ctx.getSecurity();
         String workEffortId = (String) context.get("workEffortId");
         String partyId = (String) context.get("partyId");
         String roleType = (String) context.get("roleTypeId");
         Timestamp fromDate = (Timestamp) context.get("fromDate");
-        Map actResults = (Map) context.get("result");
+        Map<String, Object> actResults = UtilGenerics.checkMap(context.get("result"));
 
         GenericValue userLogin = (GenericValue) context.get("userLogin");
 
@@ -408,12 +409,12 @@ public class WorkflowServices {
         return result;
     }
 
-    public static Map limitInvoker(DispatchContext ctx, Map context) {
-        Map result = new HashMap();
+    public static Map<String, Object> limitInvoker(DispatchContext ctx, Map<String, Object> context) {
+        Map<String, Object> result = new HashMap<String, Object>();
         LocalDispatcher dispatcher = ctx.getDispatcher();
         String workEffortId = (String) context.get("workEffortId");
         String limitService = (String) context.get("serviceName");
-        Map limitContext = (Map) context.get("serviceContext");
+        Map<String, Object> limitContext = UtilGenerics.checkMap(context.get("serviceContext"));
 
         try {
             WorkflowClient client = WfFactory.getClient(ctx);
@@ -458,16 +459,16 @@ public class WorkflowServices {
                         EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, workEffortId),
                         EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, UtilDateTime.nowTimestamp()));
 
-            Collection c = null;
+            List<GenericValue> workEffortList = null;
 
             try {
-                c = userLogin.getDelegator().findList("WorkEffortAndPartyAssign", ecl, null, null, null, false);
+                workEffortList = userLogin.getDelegator().findList("WorkEffortAndPartyAssign", ecl, null, null, null, false);
                 //Debug.logInfo("Found " + c.size() + " records.", module);
             } catch (GenericEntityException e) {
                 Debug.logWarning(e, module);
                 return false;
             }
-            if (c.size() == 0) {
+            if (workEffortList.size() == 0) {
                 ecl = EntityCondition.makeCondition(
                         EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId),
                         EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_DECLINED"),
@@ -477,7 +478,7 @@ public class WorkflowServices {
                         EntityCondition.makeCondition("workEffortParentId", EntityOperator.EQUALS, workEffortId),
                         EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, UtilDateTime.nowTimestamp()));
                 try {
-                    c = userLogin.getDelegator().findList("WorkEffortAndPartyAssign", ecl, null, null, null, false);
+                    workEffortList = userLogin.getDelegator().findList("WorkEffortAndPartyAssign", ecl, null, null, null, false);
                     //Debug.logInfo("Found " + c.size() + " records.", module);
                 } catch (GenericEntityException e) {
                     Debug.logWarning(e, module);
@@ -485,7 +486,7 @@ public class WorkflowServices {
                 }
             }
 
-            if (c.size() > 0) {
+            if (workEffortList.size() > 0) {
                 return true;
             }
         }
@@ -500,10 +501,13 @@ public class WorkflowServices {
             GenericValue we = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
 
             if (we != null && we.getString("workEffortParentId") == null) {
-                Collection c = delegator.findByAnd("WorkEffortPartyAssignment",
+                List<GenericValue> workEffortList = delegator.findByAnd("WorkEffortPartyAssignment",
                         UtilMisc.toMap("workEffortId", workEffortId, "roleTypeId", "WF_OWNER"));
 
-                return (GenericValue) c.iterator().next();
+                if (UtilValidate.isEmpty(workEffortList)) {
+                    return null;
+                }
+                return workEffortList.get(0);
             } else {
                 return getOwner(delegator, we.getString("workEffortParentId"));
             }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java?rev=932317&r1=932316&r2=932317&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java Fri Apr  9 09:40:02 2010
@@ -21,6 +21,7 @@ package org.ofbiz.workflow.definition;
 /**
  * Workflow Definition Parser Exception
  */
+@SuppressWarnings("serial")
 public final class DefinitionParserException extends org.ofbiz.base.util.GeneralException {
 
     public DefinitionParserException() {


Free forum by Nabble Edit this page