Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
c6064f7d
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6064f7d
编写于
1月 02, 2013
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACT-1498: IntermediateCatchEventActivitiBehaviour name does not match other ActivityBehavior's
上级
823fec09
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
9 deletion
+9
-9
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateCatchEventActivityBehavior.java
...bpmn/behavior/IntermediateCatchEventActivityBehavior.java
+1
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
.../java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
+3
-3
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/ActivityBehaviorFactory.java
...ine/impl/bpmn/parser/factory/ActivityBehaviorFactory.java
+2
-2
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/DefaultActivityBehaviorFactory.java
...l/bpmn/parser/factory/DefaultActivityBehaviorFactory.java
+3
-3
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateCatchEventActivit
iBehaviou
r.java
→
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateCatchEventActivit
yBehavio
r.java
浏览文件 @
c6064f7d
...
...
@@ -15,7 +15,7 @@ package org.activiti.engine.impl.bpmn.behavior;
import
org.activiti.engine.impl.pvm.delegate.ActivityExecution
;
public
class
IntermediateCatchEventActivit
iBehaviou
r
extends
AbstractBpmnActivityBehavior
{
public
class
IntermediateCatchEventActivit
yBehavio
r
extends
AbstractBpmnActivityBehavior
{
public
void
execute
(
ActivityExecution
execution
)
throws
Exception
{
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
浏览文件 @
c6064f7d
...
...
@@ -83,7 +83,7 @@ import org.activiti.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
import
org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
iBehaviou
r
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
yBehavio
r
;
import
org.activiti.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.WebServiceActivityBehavior
;
import
org.activiti.engine.impl.bpmn.data.AbstractDataAssociation
;
...
...
@@ -851,7 +851,7 @@ public class BpmnParse implements BpmnXMLConstants {
}
// Catch event behavior is the same for all types
nestedActivity
.
setActivityBehavior
(
activityBehaviorFactory
.
createIntermediateCatchEvent
(
event
));
nestedActivity
.
setActivityBehavior
(
activityBehaviorFactory
.
createIntermediateCatchEvent
ActivityBehavior
(
event
));
if
(
eventDefinition
instanceof
TimerEventDefinition
)
{
createIntermediateTimerEventDefinition
((
TimerEventDefinition
)
eventDefinition
,
nestedActivity
,
isAfterEventBasedGateway
);
...
...
@@ -2108,7 +2108,7 @@ public class BpmnParse implements BpmnXMLConstants {
}
else
if
(
destinationActivity
==
null
)
{
throw
new
ActivitiException
(
"Invalid destination '"
+
sequenceFlow
.
getTargetRef
()
+
"' of sequence flow '"
+
sequenceFlow
.
getId
()
+
"'"
);
}
else
if
(!(
sourceActivity
.
getActivityBehavior
()
instanceof
EventBasedGatewayActivityBehavior
)
&&
destinationActivity
.
getActivityBehavior
()
instanceof
IntermediateCatchEventActivit
iBehaviou
r
&&
destinationActivity
.
getActivityBehavior
()
instanceof
IntermediateCatchEventActivit
yBehavio
r
&&
(
destinationActivity
.
getParentActivity
()
!=
null
)
&&
(
destinationActivity
.
getParentActivity
().
getActivityBehavior
()
instanceof
EventBasedGatewayActivityBehavior
))
{
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/ActivityBehaviorFactory.java
浏览文件 @
c6064f7d
...
...
@@ -46,7 +46,7 @@ import org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior;
import
org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.InclusiveGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
iBehaviou
r
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
yBehavio
r
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowCompensationEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowNoneEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowSignalEventActivityBehavior
;
...
...
@@ -161,7 +161,7 @@ public interface ActivityBehaviorFactory {
public
abstract
TransactionActivityBehavior
createTransactionActivityBehavior
(
Transaction
transaction
);
public
abstract
IntermediateCatchEventActivit
iBehaviour
createIntermediateCatchEvent
(
IntermediateCatchEvent
intermediateCatchEvent
);
public
abstract
IntermediateCatchEventActivit
yBehavior
createIntermediateCatchEventActivityBehavior
(
IntermediateCatchEvent
intermediateCatchEvent
);
public
abstract
IntermediateThrowNoneEventActivityBehavior
createIntermediateThrowNoneEventActivityBehavior
(
ThrowEvent
throwEvent
);
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/DefaultActivityBehaviorFactory.java
浏览文件 @
c6064f7d
...
...
@@ -51,7 +51,7 @@ import org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior;
import
org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.InclusiveGatewayActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
iBehaviou
r
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivit
yBehavio
r
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowCompensationEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowNoneEventActivityBehavior
;
import
org.activiti.engine.impl.bpmn.behavior.IntermediateThrowSignalEventActivityBehavior
;
...
...
@@ -297,8 +297,8 @@ public class DefaultActivityBehaviorFactory extends AbstractBehaviorFactory impl
// Intermediate Events
public
IntermediateCatchEventActivit
iBehaviour
createIntermediateCatchEvent
(
IntermediateCatchEvent
intermediateCatchEvent
)
{
return
new
IntermediateCatchEventActivit
iBehaviou
r
();
public
IntermediateCatchEventActivit
yBehavior
createIntermediateCatchEventActivityBehavior
(
IntermediateCatchEvent
intermediateCatchEvent
)
{
return
new
IntermediateCatchEventActivit
yBehavio
r
();
}
public
IntermediateThrowNoneEventActivityBehavior
createIntermediateThrowNoneEventActivityBehavior
(
ThrowEvent
throwEvent
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录