Skip to content

Commit

Permalink
update 28 to fix issue #1143
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobuzzi committed Aug 3, 2020
1 parent 6158591 commit fc16f2d
Show file tree
Hide file tree
Showing 86 changed files with 220 additions and 234 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
inTransitionsAllSatisfy: aBlock

^inTransitions allSatisfy: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
inTransitionsFirst

^inTransitions first
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
inTransitionsLast

^inTransitions last

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
"hasAttachedEvents" : "brunobb 10/17/2017 12:39",
"hasInformedRoles" : "brunobb 04/30/2018 08:54",
"hasPerformers" : "BrunoBB 04/13/2016 10:17",
"inTransitions" : "BrunoBB 10/28/2015 11:57",
"inTransitions:" : "BrunoBB 10/28/2015 11:57",
"inTransitionsAllSatisfy:" : "brunobb 08/03/2020 13:59",
"inTransitionsFirst" : "brunobb 08/03/2020 14:22",
"inTransitionsLast" : "brunobb 08/03/2020 14:21",
"initialize" : "brunobb 04/28/2018 13:14",
"isEndEvent" : "BrunoBB 11/29/2015 15:10",
"isErrorEvent" : "brunobb 08/05/2019 12:38",
Expand Down Expand Up @@ -62,7 +63,6 @@
"onModificationIsInformed:" : "brunobb 05/02/2018 04:37",
"onTakeIsInformed:" : "brunobb 05/02/2018 04:38",
"onUntakeIsInformed:" : "brunobb 05/02/2018 04:38",
"outTransitions:" : "BrunoBB 10/28/2015 11:57",
"outTransitionsAllSatisfy:" : "brunobb 08/03/2020 13:11",
"outTransitionsAt:" : "brunobb 08/03/2020 13:14",
"outTransitionsCollect:" : "brunobb 08/03/2020 13:12",
Expand Down
2 changes: 1 addition & 1 deletion repository/BpmCore.package/monticello.meta/version

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsAllSatisfy: aBlock

^inTransitions allSatisfy: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsCollect: aBlock

^inTransitions collect: aBlock

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"getExpectedTimeWarningColor" : "brunobb 10/18/2019 08:00",
"getFirstPerformerIfNone:" : "brunobb 10/18/2019 08:00",
"getGrantedUsers" : "brunobb 07/31/2020 10:50",
"getInTrasitionDefinitions" : "brunobb 10/18/2019 08:00",
"getNextArtifactDefinitionNamed:ifNone:" : "brunobb 10/18/2019 08:00",
"getNextPerformerIfNone:" : "brunobb 10/18/2019 08:00",
"getNextRoleIfNone:" : "brunobb 10/18/2019 08:00",
Expand All @@ -57,8 +56,8 @@
"hasPerformers" : "brunobb 10/18/2019 08:00",
"id" : "brunobb 10/18/2019 08:00",
"id:" : "brunobb 10/18/2019 08:00",
"inTransitions" : "brunobb 10/18/2019 08:00",
"inTransitions:" : "brunobb 10/18/2019 08:00",
"inTransitionsAllSatisfy:" : "brunobb 08/03/2020 13:55",
"inTransitionsCollect:" : "brunobb 08/03/2020 13:55",
"initialize" : "brunobb 10/18/2019 08:00",
"isArtifactInstance" : "brunobb 10/18/2019 08:00",
"isCancelled" : "brunobb 10/18/2019 08:00",
Expand All @@ -81,7 +80,6 @@
"isSubprocess" : "brunobb 10/18/2019 08:00",
"isSuspended" : "brunobb 10/18/2019 08:00",
"isTask" : "brunobb 10/18/2019 08:00",
"outTransitions:" : "brunobb 10/18/2019 08:00",
"parentArtifact" : "brunobb 10/18/2019 08:00",
"parentArtifact:" : "brunobb 10/18/2019 08:00",
"parentTransition" : "brunobb 10/18/2019 08:00",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ incomingTransitionsAreDone
| inTransitionDefinitions |

"collect the definitions of all concrete incoming transitions"
inTransitionDefinitions := inTransitions collect: [:each | each definition].
inTransitionDefinitions := self inTransitionsCollect: [:each | each definition].

"all <inTransitions> in the definition of the receiver has been instanciated ?"
^definition inTransitions allSatisfy: [:each | inTransitionDefinitions includes: each]
^definition inTransitionsAllSatisfy: [:each | inTransitionDefinitions includes: each]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"createEventBasedTimerEventForGateway:" : "brunobb 08/03/2020 13:15",
"generateNextRunningTransitionsFromEvent:" : "brunobb 10/11/2018 10:18",
"incomingTransitionsAreDone" : "BrunoBB 01/22/2016 12:08",
"incomingTransitionsAreDone" : "brunobb 08/03/2020 13:59",
"initialize" : "BrunoBB 11/24/2015 13:14",
"isClosed" : "BrunoBB 11/24/2015 13:13",
"isClosed:" : "BrunoBB 11/24/2015 13:13",
Expand Down
2 changes: 1 addition & 1 deletion repository/BpmRuntime.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ acceptGatewayNode: aXPDLGatewayNode
ifTrue: [(aXPDLGatewayNode outTransitionsReject: [:eachTr | eachTr hasCondition])
do: [:eachTr | self addGatewayWithoutConditionsItem: aXPDLGatewayNode in: eachTr]
].
(aXPDLGatewayNode isGatewayForEventsNode and: [aXPDLGatewayNode inTransitions size > 1]) ifTrue: [self addEventGatewayUsedForMergingItem: aXPDLGatewayNode].
(aXPDLGatewayNode isGatewayForEventsNode and: [aXPDLGatewayNode inTransitionsSize > 1]) ifTrue: [self addEventGatewayUsedForMergingItem: aXPDLGatewayNode].

aXPDLGatewayNode isGatewayForEventsNode
ifTrue: [(aXPDLGatewayNode outTransitionsReject: [:eachTr | eachTr endNode isEventNode]) do: [:eachTr | self addNoneEventNodeAfterEventGatewayItem: eachTr endArtifact]].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"acceptActivityNode:" : "brunobb 08/03/2020 12:24",
"acceptEndEventNode:" : "brunobb 12/10/2019 08:40",
"acceptGatewayNode:" : "brunobb 08/03/2020 12:27",
"acceptGatewayNode:" : "brunobb 08/03/2020 14:00",
"acceptIntermediateEventNode:" : "brunobb 08/03/2020 12:27",
"acceptLaneNode:" : "brunobb 12/10/2019 08:40",
"acceptPoolNode:" : "bruno 07/27/2020 15:29",
Expand Down
2 changes: 1 addition & 1 deletion repository/BpmXpdl.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
addInTransition: aXPDLTransitionNode

^inTransitions add: aXPDLTransitionNode

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsDo: aBlock

inTransitions do: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsFirst

^inTransitions first

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
},
"instance" : {
"acceptVisitor:" : "brunobb 12/11/2018 03:12",
"addInTransition:" : "brunobb 08/03/2020 14:14",
"addOutTransition:" : "brunobb 08/03/2020 13:01",
"addPerformer:" : "brunobb 11/06/2018 06:53",
"asSvgGeometryFor:" : "brunobb 01/16/2019 08:46",
Expand All @@ -16,8 +17,8 @@
"hasMixedStartConditions" : "brunobb 11/06/2018 06:53",
"hasNoInOrOutTransitions" : "brunobb 11/06/2018 06:53",
"hasPerformers" : "brunobb 11/06/2018 06:53",
"inTransitions" : "brunobb 11/06/2018 06:53",
"inTransitions:" : "brunobb 11/06/2018 06:53",
"inTransitionsDo:" : "brunobb 08/03/2020 14:06",
"inTransitionsFirst" : "brunobb 08/03/2020 14:03",
"inTransitionsLast" : "brunobb 08/03/2020 12:09",
"initialize" : "brunobb 11/06/2018 06:53",
"isActivityNode" : "brunobb 11/06/2018 06:53",
Expand All @@ -31,7 +32,6 @@
"loopCondition:" : "brunobb 11/06/2018 06:53",
"loopType" : "brunobb 11/06/2018 06:53",
"loopType:" : "brunobb 11/06/2018 06:53",
"outTransitions:" : "brunobb 11/06/2018 06:53",
"outTransitionsDo:" : "brunobb 08/03/2020 12:23",
"outTransitionsFirst" : "brunobb 08/03/2020 13:27",
"outTransitionsLast" : "brunobb 08/03/2020 12:10",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
addInTransition: aXPDLTransitionNode

^inTransitions add: aXPDLTransitionNode

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsFirst

^inTransitions first
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
},
"instance" : {
"acceptVisitor:" : "brunobb 12/11/2018 02:57",
"inTransitions" : "BrunoBB 10/25/2015 09:43",
"inTransitions:" : "BrunoBB 10/25/2015 09:43",
"addInTransition:" : "brunobb 08/03/2020 14:15",
"inTransitionsFirst" : "brunobb 08/03/2020 14:23",
"inTransitionsLast" : "brunobb 08/03/2020 12:11",
"initialize" : "BrunoBB 10/24/2015 17:02",
"isEndNode" : "BrunoBB 10/25/2015 08:43",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
addInTransition: aXPDLTransitionNode

^inTransitions add: aXPDLTransitionNode

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsLast

^inTransitions last
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
inTransitionsSize

^inTransitions size

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
},
"instance" : {
"acceptVisitor:" : "brunobb 12/11/2018 02:59",
"addInTransition:" : "brunobb 08/03/2020 14:15",
"addOutTransition:" : "brunobb 08/03/2020 13:02",
"asSvgGeometryFor:" : "brunobb 12/28/2018 07:55",
"getLanesFrom:" : "brunobb 11/06/2018 06:56",
"getTooltipOrNil" : "brunobb 12/20/2018 02:22",
"hasMixedStartConditions" : "brunobb 11/06/2018 06:56",
"hasNoInOrOutTransitions" : "brunobb 11/06/2018 06:56",
"inTransitions" : "brunobb 11/06/2018 06:56",
"inTransitions:" : "brunobb 11/06/2018 06:56",
"inTransitionsLast" : "brunobb 08/03/2020 14:23",
"inTransitionsSize" : "brunobb 08/03/2020 13:59",
"initialize" : "brunobb 11/06/2018 06:56",
"isComplexGateway" : "brunobb 11/07/2018 06:58",
"isGatewayForEventsNode" : "brunobb 11/23/2018 11:01",
"isGatewayNode" : "brunobb 11/06/2018 06:56",
"lane" : "brunobb 12/11/2018 03:41",
"lane:" : "brunobb 12/11/2018 03:41",
"outConditionsAreMandatory" : "brunobb 11/06/2018 06:56",
"outTransitions:" : "brunobb 11/06/2018 06:56",
"outTransitionsDo:" : "brunobb 08/03/2020 12:25",
"outTransitionsFirst" : "brunobb 08/03/2020 12:45",
"outTransitionsLast" : "brunobb 08/03/2020 12:45",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
other
addInTransition: aXPDLTransitionNode

^inTransitions add: aXPDLTransitionNode

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
},
"instance" : {
"acceptVisitor:" : "brunobb 12/11/2018 02:58",
"addInTransition:" : "brunobb 08/03/2020 14:15",
"addOutTransition:" : "brunobb 08/03/2020 13:02",
"getTargetId" : "BrunoBB 03/05/2017 11:30",
"hostNode" : "BrunoBB 03/05/2017 11:30",
"hostNode:" : "BrunoBB 03/05/2017 11:30",
"inTransitions" : "BrunoBB 03/05/2017 11:30",
"inTransitions:" : "BrunoBB 03/05/2017 11:30",
"initialize" : "BrunoBB 03/05/2017 11:30",
"isIntermediateEventNode" : "BrunoBB 03/05/2017 11:30",
"outTransitions:" : "BrunoBB 03/05/2017 11:30",
"outTransitionsDo:" : "brunobb 08/03/2020 13:30",
"setInternalAttributesWithNode:" : "brunobb 07/29/2019 12:45" } }
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
other
addInTransition: aXPDLTransitionNode

^self inTransitions add: aXPDLTransitionNode
addInTransition: aXPDLTransitionNode

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"addInTransition:" : "brunobb 11/06/2018 06:52",
"addInTransition:" : "brunobb 08/03/2020 14:14",
"addOutTransition:" : "brunobb 08/03/2020 13:02",
"asSvgGeometryFor:" : "brunobb 12/28/2018 07:55",
"attributes" : "brunobb 11/06/2018 06:52",
Expand Down Expand Up @@ -30,7 +30,6 @@
"hasMixedStartConditions" : "brunobb 11/06/2018 06:52",
"hasNoInOrOutTransitions" : "brunobb 11/06/2018 06:52",
"id:" : "brunobb 11/06/2018 06:52",
"inTransitions" : "brunobb 11/06/2018 06:52",
"initialize" : "brunobb 11/06/2018 06:52",
"isActivityNode" : "brunobb 11/06/2018 06:52",
"isAttached" : "brunobb 11/07/2018 07:54",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"createBpmDefinitionOn:" : "brunobb 11/01/2018 04:06",
"initialize" : "BrunoBB 10/24/2015 17:02",
"isStartNode" : "BrunoBB 10/25/2015 08:43",
"outTransitions:" : "BrunoBB 10/25/2015 09:43",
"outTransitionsAnySatisfy:" : "brunobb 08/03/2020 12:37",
"outTransitionsDo:" : "brunobb 08/03/2020 13:29",
"outTransitionsLast" : "brunobb 08/03/2020 12:38",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ connectActivitiesToParentLane
eachLane xpdlObjects: (self activitiesSelect: [:eachAct | eachLane absoluteRectangleIncludesActivity: eachAct]).
"add the rol for each transition"
eachLane xpdlObjects do: [:eachAct |
eachAct inTransitions do: [:eachTr | eachTr roles: (OrderedCollection with: eachLane getName)]]
eachAct inTransitionsDo: [:eachTr | eachTr roles: (OrderedCollection with: eachLane getName)]]
].
Loading

0 comments on commit fc16f2d

Please sign in to comment.