From 1af67a2986797501bebfcd21724533b36b358572 Mon Sep 17 00:00:00 2001 From: Jan Bliznicenko Date: Wed, 4 Dec 2024 16:19:36 +0100 Subject: [PATCH] multiple multi-diagram project fixes, shapes naming unification --- repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st | 11 ++++++----- .../OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st | 7 ++++--- .../OPBPMNCollapsedSubProcessShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st | 4 ++-- .../OpenPonk-BPMN/OPBPMNDataObjectShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNEventShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st | 7 ++++--- .../OPBPMNIntermediateEventShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNModel.class.st | 5 ----- .../OpenPonk-BPMN/OPBPMNNavigatorAdapter.class.st | 8 ++++---- repository/OpenPonk-BPMN/OPBPMNNodeModel.class.st | 5 ----- repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st | 4 ++-- repository/OpenPonk-BPMN/OPBPMNPoolModel.class.st | 5 ----- repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st | 4 ++-- .../OpenPonk-BPMN/OPBPMNStartEventShape.class.st | 4 ++-- .../OpenPonk-BPMN/OPBPMNSubProcessModel.class.st | 6 ------ .../OpenPonk-BPMN/OPBPMNSubProcessShape.class.st | 4 ++-- 21 files changed, 44 insertions(+), 62 deletions(-) diff --git a/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st b/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st index 1ba648f..a5f7850 100644 --- a/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNActivityShape.class.st @@ -4,9 +4,9 @@ Class { #instVars : [ 'border' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'ston-core' } @@ -43,9 +43,9 @@ OPBPMNActivityShape >> createRoassalShape [ { #category : 'initialization' } OPBPMNActivityShape >> initialize [ + super initialize. - self createBorder. - + self createBorder ] { #category : 'rendering' } @@ -67,7 +67,8 @@ OPBPMNActivityShape >> renderShapeDetails [ self color: (Color fromHexString: 'f2f2f2'). "TODO for what are good bounds?????" - self bounds: nil + "JanBliznicenko: To persist position and size for persistence" + "self bounds: nil" ] { #category : 'rendering' } diff --git a/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st index 3376c73..7b8c887 100644 --- a/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNBoundaryEventShape.class.st @@ -6,9 +6,9 @@ Class { 'borderOut', 'innerCircle' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'removing' } @@ -85,7 +85,8 @@ OPBPMNBoundaryEventShape >> renderShapeDetails [ self canvas add: innerCircle. RSLocation new stick: innerCircle on: self roassalShape. "TODO for what are good bounds?????" - self bounds: nil + "JanBliznicenko: To persist position and size for persistence" + "self bounds: nil" "roassalShape @ OPRSSelectionDraggable." ] diff --git a/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st b/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st index e930d02..4cf9c3a 100644 --- a/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNCollapsedSubProcessShape.class.st @@ -5,9 +5,9 @@ Class { 'subprocessIcon', 'border' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'ston-core' } diff --git a/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st b/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st index 3f64e0d..c52a6ab 100644 --- a/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNDataFlowShape.class.st @@ -4,9 +4,9 @@ Class { #instVars : [ 'borderColor' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'rendering' } diff --git a/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st b/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st index cdfd80b..13e7f19 100644 --- a/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNDataObjectShape.class.st @@ -5,9 +5,9 @@ Class { 'icon', 'borderColor' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'removing' } diff --git a/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st b/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st index 2d7bf9c..225baf8 100644 --- a/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNEdgeLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNEdgeLabel', #superclass : 'OPEdgeLabel', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'as yet unclassified' } diff --git a/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st index e961135..3dd092f 100644 --- a/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNEndEventShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNEndEventShape', #superclass : 'OPBPMNEventShape', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'connecting' } diff --git a/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st index c3511a7..2ad0519 100644 --- a/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNEventShape.class.st @@ -1,7 +1,7 @@ Class { #name : 'OPBPMNEventShape', #superclass : 'OPBPMNNodeShape', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } diff --git a/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st b/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st index 0b7b028..52d8915 100644 --- a/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNFlowShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNFlowShape', #superclass : 'OPEdge', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'as yet unclassified' } diff --git a/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st b/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st index c8783a5..becfdd0 100644 --- a/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNGatewayShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNGatewayShape', #superclass : 'OPBPMNNodeShape', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'connecting' } @@ -20,5 +20,6 @@ OPBPMNGatewayShape >> renderShapeDetails [ super renderShapeDetails. self color: (Color fromHexString: 'bce2fe'). "TODO for what are good bounds?????" - self bounds: nil. + "JanBliznicenko: To persist position and size for persistence" + "self bounds: nil" ] diff --git a/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st index a07d574..3c41cb4 100644 --- a/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNIntermediateEventShape.class.st @@ -4,9 +4,9 @@ Class { #instVars : [ 'innerCircle' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st b/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st index 9f4dc67..457297e 100644 --- a/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNMessageShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNMessageShape', #superclass : 'OPEdge', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'hooks' } diff --git a/repository/OpenPonk-BPMN/OPBPMNModel.class.st b/repository/OpenPonk-BPMN/OPBPMNModel.class.st index 4d2b2b7..1c24b4b 100644 --- a/repository/OpenPonk-BPMN/OPBPMNModel.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNModel.class.st @@ -10,11 +10,6 @@ Class { #tag : 'Models' } -{ #category : 'accessing' } -OPBPMNModel >> allEntities [ - ^ Set with: self nodes -] - { #category : 'accessing' } OPBPMNModel >> edges [ ^ elements select: #isEdge diff --git a/repository/OpenPonk-BPMN/OPBPMNNavigatorAdapter.class.st b/repository/OpenPonk-BPMN/OPBPMNNavigatorAdapter.class.st index 952d0f0..095c13f 100644 --- a/repository/OpenPonk-BPMN/OPBPMNNavigatorAdapter.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNNavigatorAdapter.class.st @@ -14,10 +14,10 @@ OPBPMNNavigatorAdapter class >> priority [ { #category : 'widget API' } OPBPMNNavigatorAdapter >> childrenMapping [ - ^ { (OPBPMNModel -> #nodes). - (OPBPMNPoolModel -> #nodes). - (OPBPMNSubProcessModel -> #nodes). - (OPBPMNNodeModel -> #outgoing) } + + ^ { + (OPBPMNModel -> [ :o | o nodes ]). + (OPBPMNNodeModel -> [ :o | o nodes , o outgoing ]) } ] { #category : 'widget API' } diff --git a/repository/OpenPonk-BPMN/OPBPMNNodeModel.class.st b/repository/OpenPonk-BPMN/OPBPMNNodeModel.class.st index 4d27405..7076dbd 100644 --- a/repository/OpenPonk-BPMN/OPBPMNNodeModel.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNNodeModel.class.st @@ -30,11 +30,6 @@ OPBPMNNodeModel >> addFlow: aFlow [ ifFalse: [ self changed ] ] -{ #category : 'accessing' } -OPBPMNNodeModel >> allEntities [ - ^ Set with: self flows -] - { #category : 'accessing' } OPBPMNNodeModel >> connected [ owner ifNil: [ ^ #() ]. diff --git a/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st b/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st index ed6d8e3..0c15f37 100644 --- a/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNNodeShape.class.st @@ -5,9 +5,9 @@ Class { 'icon', 'borderColor' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'ston-core' } diff --git a/repository/OpenPonk-BPMN/OPBPMNPoolModel.class.st b/repository/OpenPonk-BPMN/OPBPMNPoolModel.class.st index e7cbcc0..78f5fed 100644 --- a/repository/OpenPonk-BPMN/OPBPMNPoolModel.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNPoolModel.class.st @@ -72,11 +72,6 @@ OPBPMNPoolModel >> nodeNamed: aName [ ^ self elementNamed: aName ] -{ #category : 'accessing' } -OPBPMNPoolModel >> nodes [ - ^ elements -] - { #category : 'printing' } OPBPMNPoolModel >> printType [ ^ 'process' diff --git a/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st b/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st index 17ccd34..41a2091 100644 --- a/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNPoolShape.class.st @@ -9,9 +9,9 @@ Class { 'b2', 'borderColor' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'adding' } diff --git a/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st b/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st index f500722..0438d10 100644 --- a/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNStartEventShape.class.st @@ -4,9 +4,9 @@ Class { #instVars : [ 'border' ], - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'connecting' } diff --git a/repository/OpenPonk-BPMN/OPBPMNSubProcessModel.class.st b/repository/OpenPonk-BPMN/OPBPMNSubProcessModel.class.st index 17af044..36c2c07 100644 --- a/repository/OpenPonk-BPMN/OPBPMNSubProcessModel.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNSubProcessModel.class.st @@ -25,12 +25,6 @@ OPBPMNSubProcessModel >> nodeNamed: aName [ ^ self elementNamed: aName ] -{ #category : 'accessing' } -OPBPMNSubProcessModel >> nodes [ - - ^ elements -] - { #category : 'accessing' } OPBPMNSubProcessModel >> printType [ diff --git a/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st b/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st index 997a34c..692f21f 100644 --- a/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st +++ b/repository/OpenPonk-BPMN/OPBPMNSubProcessShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPBPMNSubProcessShape', #superclass : 'OPBPMNNodeShape', - #category : 'OpenPonk-BPMN-Shapes', + #category : 'OpenPonk-BPMN-DiagramElements', #package : 'OpenPonk-BPMN', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'connecting' }