sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(import): add flowElements to participant 

This changes the tree walker to add FlowElements directly to a
participant, independent of their lane assignments.
This commit is contained in:
Nico Rehwaldt 2015-10-10 01:33:21 +02:00 committed by pedesen
parent a0a8b38c46
commit 523c10b5c6
3 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/import/BpmnTreeWalker.js
View File

@ -315,11 +315,6 @@ function BpmnTreeWalker(handler) {
if (lane.childLaneSet) { if (lane.childLaneSet) {
handleLaneSet(lane.childLaneSet, newContext || context); handleLaneSet(lane.childLaneSet, newContext || context);
} else {
var filterList = filter(lane.flowNodeRef, function(e) {
return e.$type !== 'bpmn:BoundaryEvent';
});
handleFlowElements(filterList, newContext || context);
} }
} }
@ -332,41 +327,12 @@ function BpmnTreeWalker(handler) {
} }
function handleFlowElementsContainer(container, context) { function handleFlowElementsContainer(container, context) {
if (container.laneSets) { if (container.laneSets) {
handleLaneSets(container.laneSets, context); handleLaneSets(container.laneSets, context);
handleNonFlowNodes(container.flowElements, context); }
} else {
handleFlowElements(container.flowElements, context); handleFlowElements(container.flowElements, context);
} }
}
function handleNonFlowNodes(flowElements, context) {
forEach(flowElements, function(e) {
if (isHandled(e)) {
return;
}
if (is(e, 'bpmn:SequenceFlow')) {
deferred.push(function() {
handleSequenceFlow(e, context);
});
} else if (is(e, 'bpmn:BoundaryEvent')) {
deferred.unshift(function() {
handleBoundaryEvent(e, context);
});
} else if (is(e, 'bpmn:FlowNode')) {
handleFlowNode(e, context);
} else if (is(e, 'bpmn:DataObject')) {
// SKIP (assume correct referencing via DataObjectReference)
} else if (is(e, 'bpmn:DataStoreReference')) {
handleDataElement(e, context);
} else if (is(e, 'bpmn:DataObjectReference')) {
handleDataElement(e, context);
}
});
}
function handleFlowElements(flowElements, context) { function handleFlowElements(flowElements, context) {
forEach(flowElements, function(e) { forEach(flowElements, function(e) {

2
test/spec/import/ImporterSpec.js
View File

@ -252,7 +252,7 @@ describe('import - Importer', function() {
// when // when
runImport(diagram, xml, function(err, warnings) { runImport(diagram, xml, function(err, warnings) {
expect(warnings.length).to.equal(1); expect(warnings.length).to.equal(0);
done(err); done(err);
}); });

9
test/spec/import/ModelWiringSpec.js
View File

@ -144,16 +144,15 @@ describe('import - model wiring', function() {
beforeEach(bootstrapViewer(xml)); beforeEach(bootstrapViewer(xml));
it('should wire parent child relationship', inject(function(elementRegistry) { it('should import flowElements as children of Participant', inject(function(elementRegistry) {
// when // when
var laneShape = elementRegistry.get('Lane'), var participantShape = elementRegistry.get('Participant_Lane'),
participantShape = elementRegistry.get('Participant_Lane'),
taskShape = elementRegistry.get('Task'), taskShape = elementRegistry.get('Task'),
sequenceFlowElement = elementRegistry.get('SequenceFlow'); sequenceFlowElement = elementRegistry.get('SequenceFlow');
// then // then
expect(taskShape.parent).to.eql(laneShape); expect(taskShape.parent).to.eql(participantShape);
expect(sequenceFlowElement.parent).to.eql(participantShape); expect(sequenceFlowElement.parent).to.eql(participantShape);
})); }));
@ -167,7 +166,7 @@ describe('import - model wiring', function() {
beforeEach(bootstrapViewer(xml)); beforeEach(bootstrapViewer(xml));
it('should wire parent child relationship', inject(function(elementRegistry) { it('should import flowElements as children of Participant', inject(function(elementRegistry) {
// when // when
var participantShape = elementRegistry.get('Participant_Lane'), var participantShape = elementRegistry.get('Participant_Lane'),