[jbpm-commits] JBoss JBPM SVN: r1638 - in api/trunk/modules/api/src/main/java/org/jboss/bpm/model: internal and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jul 15 10:44:45 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-15 10:44:45 -0400 (Tue, 15 Jul 2008)
New Revision: 1638
Added:
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java
Modified:
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
Log:
Remove access to Flow setters
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -37,9 +37,4 @@
* Get the list of in flows
*/
List<Flow> getInFlows();
-
- /**
- * TODO: remove from the API
- */
- void addInFlow(Flow flow);
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -26,7 +26,7 @@
//$Id$
/**
- * Implementing {@link FlowObject}s support multiple outgoing {@link Flow}s.
+ * Implementing {@link FlowObject} support multiple outgoing {@link Flow}.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
@@ -37,10 +37,4 @@
* Get the list of out flows
*/
List<Flow> getOutFlows();
-
- /**
- * TODO: remove from the API
- */
- void addOutFlow(Flow flow);
-
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -21,11 +21,10 @@
*/
package org.jboss.bpm.model;
-
//$Id$
/**
- * Implementing {@link FlowObject}s support a single incomming {@link Flow}s.
+ * Implementing {@link FlowObject} support a single incomming {@link Flow}.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
@@ -36,9 +35,4 @@
* Get the out flow
*/
Flow getInFlow();
-
- /**
- * TODO: remove from the API
- */
- void setInFlow(Flow flow);
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -36,9 +36,4 @@
* Get the out flow
*/
Flow getOutFlow();
-
- /**
- * TODO: remove from the API
- */
- void setOutFlow(Flow flow);
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -46,7 +46,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class EndEventImpl extends EventImpl implements EndEvent
+public class EndEventImpl extends EventImpl implements EndEvent, SingleInFlowSetterSupport
{
// provide logging
private static final Log log = LogFactory.getLog(EndEventImpl.class);
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -134,14 +134,14 @@
if (target == null)
throw new InvalidProcessException("Cannot find target for out flow: " + name);
- if (target instanceof SingleInFlowSupport)
+ if (target instanceof SingleInFlowSetterSupport)
{
- SingleInFlowSupport sif = (SingleInFlowSupport)target;
+ SingleInFlowSetterSupport sif = (SingleInFlowSetterSupport)target;
sif.setInFlow(flow);
}
- else if (target instanceof MultipleInFlowSupport)
+ else if (target instanceof MultipleInFlowSetterSupport)
{
- MultipleInFlowSupport mif = (MultipleInFlowSupport)target;
+ MultipleInFlowSetterSupport mif = (MultipleInFlowSetterSupport)target;
mif.addInFlow(flow);
}
else
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -48,7 +48,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class GatewayImpl extends FlowObjectImpl implements Gateway, HandlerSetterSupport
+public class GatewayImpl extends FlowObjectImpl implements Gateway, HandlerSetterSupport, MultipleInFlowSetterSupport, MultipleOutFlowSetterSupport
{
// provide logging
private static final Log log = LogFactory.getLog(GatewayImpl.class);
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -44,7 +44,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class IntermediateEventImpl extends EventImpl implements IntermediateEvent
+public class IntermediateEventImpl extends EventImpl implements IntermediateEvent, SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
// provide logging
private static final Log log = LogFactory.getLog(IntermediateEventImpl.class);
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model.internal;
+
+import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.MultipleInFlowSupport;
+
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject} support multiple incomming {@link Flow}.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MultipleInFlowSetterSupport extends MultipleInFlowSupport
+{
+ /**
+ * Add an incomming Flow
+ */
+ void addInFlow(Flow flow);
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model.internal;
+
+import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.MultipleOutFlowSupport;
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject} support multiple outgoing {@link Flow}.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface MultipleOutFlowSetterSupport extends MultipleOutFlowSupport
+{
+ /**
+ * Add an outgoing Flow
+ */
+ void addOutFlow(Flow flow);
+
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -24,10 +24,8 @@
//$Id$
import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.MultipleOutFlowSupport;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.SingleOutFlowSupport;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.HandlerSetterSupport;
@@ -65,14 +63,14 @@
public ProcessBuilder addSequenceFlow(String name)
{
- if (flowObject instanceof SingleOutFlowSupport)
+ if (flowObject instanceof SingleOutFlowSetterSupport)
{
- SingleOutFlowSupport outFlow = (SingleOutFlowSupport)flowObject;
+ SingleOutFlowSetterSupport outFlow = (SingleOutFlowSetterSupport)flowObject;
outFlow.setOutFlow(new SequenceFlowImpl(name));
}
- else if (flowObject instanceof MultipleOutFlowSupport)
+ else if (flowObject instanceof MultipleOutFlowSetterSupport)
{
- MultipleOutFlowSupport outFlow = (MultipleOutFlowSupport)flowObject;
+ MultipleOutFlowSetterSupport outFlow = (MultipleOutFlowSetterSupport)flowObject;
outFlow.addOutFlow(new SequenceFlowImpl(name));
}
else
@@ -84,14 +82,14 @@
public ProcessBuilder addMessageFlow(String name)
{
- if (flowObject instanceof SingleOutFlowSupport)
+ if (flowObject instanceof SingleOutFlowSetterSupport)
{
- SingleOutFlowSupport outFlow = (SingleOutFlowSupport)flowObject;
+ SingleOutFlowSetterSupport outFlow = (SingleOutFlowSetterSupport)flowObject;
outFlow.setOutFlow(new MessageFlowImpl(name));
}
- else if (flowObject instanceof MultipleOutFlowSupport)
+ else if (flowObject instanceof MultipleOutFlowSetterSupport)
{
- MultipleOutFlowSupport outFlow = (MultipleOutFlowSupport)flowObject;
+ MultipleOutFlowSetterSupport outFlow = (MultipleOutFlowSetterSupport)flowObject;
outFlow.addOutFlow(new MessageFlowImpl(name));
}
else
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model.internal;
+
+import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.SingleInFlowSupport;
+
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject} support a single incomming {@link Flow}.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SingleInFlowSetterSupport extends SingleInFlowSupport
+{
+ /**
+ * Set the incomming Flow
+ */
+ void setInFlow(Flow flow);
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java (rev 0)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.model.internal;
+
+import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.FlowObject;
+import org.jboss.bpm.model.SingleOutFlowSupport;
+
+
+//$Id$
+
+/**
+ * Implementing {@link FlowObject}s support a single outgoing {@link Flow}s.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface SingleOutFlowSetterSupport extends SingleOutFlowSupport
+{
+ /**
+ * Set the outgoing Flow
+ */
+ void setOutFlow(Flow flow);
+}
Property changes on: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -42,7 +42,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class StartEventImpl extends EventImpl implements StartEvent
+public class StartEventImpl extends EventImpl implements StartEvent, SingleOutFlowSetterSupport
{
// provide logging
private static final Log log = LogFactory.getLog(StartEventImpl.class);
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -41,7 +41,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class SubProcessImpl extends ProcessImpl implements SubProcess, HandlerSetterSupport
+public class SubProcessImpl extends ProcessImpl implements SubProcess, HandlerSetterSupport, SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
private Flow inFlow;
private Flow outFlow;
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-07-15 14:26:52 UTC (rev 1637)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-07-15 14:44:45 UTC (rev 1638)
@@ -45,7 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public class TaskImpl extends ActivityImpl implements Task, HandlerSetterSupport
+public class TaskImpl extends ActivityImpl implements Task, HandlerSetterSupport, SingleInFlowSetterSupport, SingleOutFlowSetterSupport
{
// provide logging
private static final Log log = LogFactory.getLog(TaskImpl.class);
More information about the jbpm-commits
mailing list