[jbpm-commits] JBoss JBPM SVN: r1752 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/model and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jul 29 13:28:54 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-29 13:28:54 -0400 (Tue, 29 Jul 2008)
New Revision: 1752
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/TaskA.java
Log:
Fix warnings
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -60,7 +60,7 @@
}
}
- public static ObjectName create(String domain, Hashtable table)
+ public static ObjectName create(String domain, Hashtable<String, String> table)
{
try
{
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -21,8 +21,6 @@
*/
package org.jboss.bpm.client;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
// $Id$
@@ -39,9 +37,6 @@
/** The default bean config: jbpm-beans.xml */
public static final String JBPM_ENGINE_CONFIG = "jbpm-beans.xml";
- // provide logging
- private static final Log log = LogFactory.getLog(ProcessEngine.class);
-
// Injected through the MC
protected ProcessManager processManager;
// Injected through the MC
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -218,7 +218,7 @@
else
throw rte;
}
- Thread.currentThread().sleep(100);
+ Thread.sleep(100);
now = System.currentTimeMillis();
}
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -46,6 +46,7 @@
/**
* Get a MessageBuilderFactory instance.
*/
+ @SuppressWarnings("deprecation")
public static MessageBuilderFactory newInstance()
{
Kernel kernel = KernelLocator.getKernel();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -46,6 +46,7 @@
/**
* Get a ProcessBuilderFactory instance.
*/
+ @SuppressWarnings("deprecation")
public static ProcessBuilderFactory newInstance()
{
Kernel kernel = KernelLocator.getKernel();
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -46,6 +46,7 @@
/**
* Get a MessageBuilderFactory instance.
*/
+ @SuppressWarnings("deprecation")
public static PropertyBuilderFactory newInstance()
{
Kernel kernel = KernelLocator.getKernel();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -135,6 +135,7 @@
/**
* The initial flow 'to' the StartEvent
*/
+ @SuppressWarnings("serial")
class InitialFlow extends SequenceFlowImpl
{
InitialFlow(StartEvent start)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -29,8 +29,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Activity;
@@ -61,9 +59,6 @@
@SuppressWarnings("serial")
public abstract class ActivityImpl extends FlowObjectImpl implements Activity, MutablePropertySupport, SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
- // provide logging
- private static final Log log = LogFactory.getLog(ActivityImpl.class);
-
private String name;
private List<InputSet> inputSets = new ArrayList<InputSet>();
private List<OutputSet> outputSets = new ArrayList<OutputSet>();
@@ -315,12 +310,12 @@
*/
protected void postProcessInputSet(Token token, InputSet inputSet)
{
- ExecutionContext exContext = token.getExecutionContext();
- for (Property prop : inputSet.getProperties())
- {
- // TODO: define proper scope for token data
- // exContext.removeAttachment(prop.getName());
- }
+// ExecutionContext exContext = token.getExecutionContext();
+// for (Property prop : inputSet.getProperties())
+// {
+// // TODO: define proper scope for token data
+// exContext.removeAttachment(prop.getName());
+// }
}
public FlowHandler getFlowHandler()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -35,6 +35,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class ComplexGatewayImpl extends GatewayImpl implements ComplexGateway
{
public ComplexGatewayImpl(String name)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -31,6 +31,7 @@
* @author thomas.diesler at jboss.com
* @since 21-Jul-2008
*/
+ at SuppressWarnings("serial")
public class EntityImpl extends ParticipantImpl implements Entity
{
private String name;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -33,6 +33,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class EventImpl extends FlowObjectImpl implements Event
{
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -33,6 +33,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class ExclusiveGatewayDataBasedImpl extends ExclusiveGatewayImpl implements ExclusiveGatewayDataBased
{
public ExclusiveGatewayDataBasedImpl(String name)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -32,7 +32,6 @@
import org.jboss.bpm.model.Flow;
import org.jboss.bpm.model.Gate;
import org.jboss.bpm.model.SequenceFlow;
-import org.jboss.bpm.model.ExclusiveGateway.ExclusiveType;
import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.model.SequenceFlow.ConditionType;
import org.jboss.bpm.runtime.ExecutionContext;
@@ -49,6 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class ExclusiveGatewayImpl extends GatewayImpl implements ExclusiveGateway
{
public ExclusiveGatewayImpl(String name)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -32,6 +32,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class ExpressionImpl extends SupportingElementImpl implements Expression
{
private String body;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -23,9 +23,7 @@
//$Id$
-import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Flow;
-import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.GraphicalElement;
/**
@@ -35,6 +33,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class FlowImpl extends SupportingElementImpl implements Flow
{
private String name;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -39,6 +39,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class GateImpl extends SupportingElementImpl implements Gate
{
private SequenceFlow seqFlow;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -32,6 +32,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class HandlerImpl implements Handler
{
private String className;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,9 +27,7 @@
import java.util.Collections;
import java.util.List;
-import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.ArtifactInput;
-import org.jboss.bpm.model.ArtifactOutput;
import org.jboss.bpm.model.InputSet;
import org.jboss.bpm.model.Property;
import org.jboss.bpm.runtime.MutablePropertySupport;
@@ -40,6 +38,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class InputSetImpl extends SupportingElementImpl implements InputSet, MutablePropertySupport
{
private List<ArtifactInput> artInputs = new ArrayList<ArtifactInput>();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -45,6 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class IntermediateEventImpl extends EventImpl implements IntermediateEvent, SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
// provide logging
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -35,6 +35,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class MessageFlowImpl extends FlowImpl implements MessageFlow
{
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,11 +27,9 @@
import javax.management.ObjectName;
-import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.Participant;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.PropertySupport;
import org.jboss.bpm.runtime.MutablePropertySupport;
//$Id$
@@ -44,6 +42,7 @@
* @author thomas.diesler at jboss.com
* @since 21-Jul-2008
*/
+ at SuppressWarnings("serial")
public class MessageImpl extends SupportingElementImpl implements Message, MutablePropertySupport
{
private String name;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -30,6 +30,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class NoneTaskImpl extends TaskImpl
{
public NoneTaskImpl(String name)
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,7 +27,6 @@
import java.util.Collections;
import java.util.List;
-import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.model.ArtifactOutput;
import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Property;
@@ -39,6 +38,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class OutputSetImpl extends SupportingElementImpl implements OutputSet, MutablePropertySupport
{
private List<ArtifactOutput> artOutputs = new ArrayList<ArtifactOutput>();
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -34,6 +34,7 @@
* @author thomas.diesler at jboss.com
* @since 21-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class ParticipantImpl extends SupportingElementImpl implements Participant
{
protected Entity entityRef;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -39,7 +39,6 @@
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.InputSet;
-import org.jboss.bpm.model.Message;
import org.jboss.bpm.model.NameSupport;
import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Process;
@@ -53,6 +52,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class ProcessImpl extends SupportingElementImpl implements Process
{
// The required process name
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -32,12 +32,13 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class PropertyImpl extends SupportingElementImpl implements Property
{
private String name;
private Expression expression;
private boolean isCorrelation;
-
+
public PropertyImpl(String name, Expression expression)
{
this.expression = expression;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -48,6 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class ReceiveTaskImpl extends TaskImpl implements ReceiveTask, MessageListener
{
private static final int RECEIVE_TIMEOUT = 5000;
@@ -95,7 +96,7 @@
{
return getID();
}
-
+
public void catchMessage(Message message)
{
String msgName = message.getName();
@@ -125,7 +126,7 @@
{
try
{
- Thread.currentThread().sleep(500);
+ Thread.sleep(500);
now = System.currentTimeMillis();
}
catch (InterruptedException ex)
@@ -133,12 +134,12 @@
log.error("ReceiveTask interrupted" + ex.toString());
}
}
-
+
// Timeout if the message did not arrive
if (messages.size() == 0)
throw new ProcessTimeoutException("Message receive timeout in: " + this);
-
- // Copy the expected properties from the
+
+ // Copy the expected properties from the
// received message to the execution context
Message msg = messages.remove(0);
ExecutionContext exContext = token.getExecutionContext();
@@ -148,7 +149,7 @@
Expression value = msg.getProperty(key).getValue();
exContext.addAttachment(key, value.getExpressionBody());
}
-
+
// Call default execute
super.execute(token);
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -31,6 +31,7 @@
* @author thomas.diesler at jboss.com
* @since 21-Jul-2008
*/
+ at SuppressWarnings("serial")
public class RoleImpl extends ParticipantImpl implements Role
{
private String name;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -33,6 +33,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class SequenceFlowImpl extends FlowImpl implements SequenceFlow
{
private ConditionType conditionType = ConditionType.None;
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -47,6 +47,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public class StartEventImpl extends EventImpl implements StartEvent, SingleOutFlowSetterSupport
{
// provide logging
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -30,6 +30,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class SupportingElementImpl extends BPMNElementImpl implements SupportingElement
{
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -38,7 +38,7 @@
public class TaskBuilderImpl extends ActivityBuilderImpl implements TaskBuilder
{
private MessageImpl message;
-
+
public TaskBuilderImpl(ProcessImpl proc, FlowObjectImpl flowObject)
{
super(proc, flowObject);
@@ -51,7 +51,7 @@
{
if (targetID != null)
throw new IllegalArgumentException("Message targetID must be null for ReceiveTask");
-
+
ReceiveTaskImpl receiveTask = (ReceiveTaskImpl)flowObject;
receiveTask.setMessageRef(message);
}
@@ -59,7 +59,7 @@
{
if (targetID == null)
throw new IllegalArgumentException("Message targetID cannot be null for SendTask");
-
+
SendTaskImpl sendTask = (SendTaskImpl)flowObject;
sendTask.setMessageRef(message);
}
@@ -82,11 +82,4 @@
super.addExecutionHandler(clazz);
return this;
}
-
- private Task getTask()
- {
- if (flowObject instanceof Task == false)
- throw new IllegalStateException("Last added flow object is not a Task");
- return (Task)flowObject;
- }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -36,6 +36,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
+ at SuppressWarnings("serial")
public abstract class TaskImpl extends ActivityImpl implements Task
{
public TaskImpl(String name)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -190,14 +190,4 @@
getMessage();
return msg;
}
-
- private Message getDenyOfferMessage()
- {
- MessageBuilderFactory msgFactory = MessageBuilderFactory.newInstance();
- MessageBuilder msgBuilder = msgFactory.newMessageBuilder();
- Message msg = msgBuilder.newMessage("AcceptOfferMsg", null).
- addProperty("isOfferAccepted", "false").
- getMessage();
- return msg;
- }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -36,6 +36,7 @@
* @author Thomas.Diesler at jboss.com
* @since 04-Jul-2008
*/
+ at SuppressWarnings("serial")
public class AvailabilityHandler implements ExecutionHandler
{
public void execute(Token token, InputSet inputSet, OutputSet outputSet)
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,7 +27,6 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.jboss.bpm.client.ProcessEngineLocator;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Process;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,7 +27,6 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.jboss.bpm.client.ProcessEngineLocator;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Process;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -27,7 +27,6 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
-import org.jboss.bpm.client.ProcessEngineLocator;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Process;
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/TaskA.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/TaskA.java 2008-07-29 15:17:43 UTC (rev 1751)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/TaskA.java 2008-07-29 17:28:54 UTC (rev 1752)
@@ -37,6 +37,7 @@
* @author Thomas.Diesler at jboss.com
* @since 04-Jul-2008
*/
+ at SuppressWarnings("serial")
public class TaskA implements ExecutionHandler
{
public void execute(Token token, InputSet inputSet, OutputSet outputSet)
More information about the jbpm-commits
mailing list