Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
578c3678
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,发现更多精彩内容 >>
提交
578c3678
编写于
10月 12, 2017
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Manually merged PR #601
上级
f400d374
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
17 deletion
+23
-17
modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/export/MultiInstanceExport.java
...g/flowable/bpmn/converter/export/MultiInstanceExport.java
+22
-17
modules/flowable-bpmn-converter/src/test/resources/multiinstancemodel2.bpmn
...pmn-converter/src/test/resources/multiinstancemodel2.bpmn
+1
-0
未找到文件。
modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/export/MultiInstanceExport.java
浏览文件 @
578c3678
...
...
@@ -32,6 +32,8 @@ public class MultiInstanceExport implements BpmnXMLConstants {
if
(
activity
.
getLoopCharacteristics
()
!=
null
)
{
MultiInstanceLoopCharacteristics
multiInstanceObject
=
activity
.
getLoopCharacteristics
();
CollectionHandler
handler
=
multiInstanceObject
.
getHandler
();
boolean
didWriteExtensionStartElement
=
false
;
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getLoopCardinality
())
||
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getInputDataItem
())
||
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getCompletionCondition
())
||
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getCollectionString
()))
{
...
...
@@ -44,21 +46,12 @@ public class MultiInstanceExport implements BpmnXMLConstants {
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getElementVariable
()))
{
BpmnXMLUtil
.
writeQualifiedAttribute
(
ATTRIBUTE_MULTIINSTANCE_VARIABLE
,
multiInstanceObject
.
getElementVariable
(),
xtw
);
}
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getLoopCardinality
()))
{
xtw
.
writeStartElement
(
ELEMENT_MULTIINSTANCE_CARDINALITY
);
xtw
.
writeCharacters
(
multiInstanceObject
.
getLoopCardinality
());
xtw
.
writeEndElement
();
}
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getCompletionCondition
()))
{
xtw
.
writeStartElement
(
ELEMENT_MULTIINSTANCE_CONDITION
);
xtw
.
writeCharacters
(
multiInstanceObject
.
getCompletionCondition
());
xtw
.
writeEndElement
();
}
// check for collection element handler
// check for collection element handler
extension first since process validation is order-dependent
if
(
handler
!=
null
)
{
// start extensions
xtw
.
writeStartElement
(
ELEMENT_EXTENSIONS
);
didWriteExtensionStartElement
=
true
;
// start collection element
xtw
.
writeStartElement
(
FLOWABLE_EXTENSIONS_NAMESPACE
,
ELEMENT_MULTIINSTANCE_COLLECTION
);
...
...
@@ -84,17 +77,29 @@ public class MultiInstanceExport implements BpmnXMLConstants {
}
// check for extension elements
// check for
other custom
extension elements
Map
<
String
,
List
<
ExtensionElement
>>
extensions
=
multiInstanceObject
.
getExtensionElements
();
if
(!
extensions
.
isEmpty
())
{
BpmnXMLUtil
.
writeExtensionElements
(
multiInstanceObject
,
handler
!=
null
,
model
.
getNamespaces
(),
xtw
);
didWriteExtensionStartElement
=
BpmnXMLUtil
.
writeExtensionElements
(
multiInstanceObject
,
didWriteExtensionStartElement
,
model
.
getNamespaces
(),
xtw
);
}
// end extensions element
if
(
didWriteExtensionStartElement
)
{
xtw
.
writeEndElement
();
}
// end extensions element
if
(
handler
!=
null
)
{
xtw
.
writeEndElement
();
}
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getLoopCardinality
()))
{
xtw
.
writeStartElement
(
ELEMENT_MULTIINSTANCE_CARDINALITY
);
xtw
.
writeCharacters
(
multiInstanceObject
.
getLoopCardinality
());
xtw
.
writeEndElement
();
}
if
(
StringUtils
.
isNotEmpty
(
multiInstanceObject
.
getCompletionCondition
()))
{
xtw
.
writeStartElement
(
ELEMENT_MULTIINSTANCE_CONDITION
);
xtw
.
writeCharacters
(
multiInstanceObject
.
getCompletionCondition
());
xtw
.
writeEndElement
();
}
// end multi-instance element
xtw
.
writeEndElement
();
}
}
...
...
modules/flowable-bpmn-converter/src/test/resources/multiinstancemodel2.bpmn
浏览文件 @
578c3678
...
...
@@ -41,6 +41,7 @@
<flowable:expression>
${potentialOwnerList}
</flowable:expression>
</flowable:collection>
</extensionElements>
<completionCondition>
${nrOfInstances==2}
</completionCondition>
</multiInstanceLoopCharacteristics>
</userTask>
<sequenceFlow
id=
"subFlowId1"
sourceRef=
"subStartEvent"
targetRef=
"subUserTask1"
></sequenceFlow>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录