Merge 7a6e9f1

repository/OpenPonk-BormEditor/BormParticipantShape.class.st

@@ -3,14 +3,25 @@ Class {
 	#superclass : 'OPBoundNode',
 	#instVars : [
 		'innerRoassalShapesBlock',
-		'typeIconProvider',
 		'icon'
 	],
 	#category : 'OpenPonk-BormEditor-Shapes',
 	#package : 'OpenPonk-BormEditor',
 	#tag : 'Shapes'
 }
 
+{ #category : 'printing' }
+BormParticipantShape class >> typeIconFor: aType [
+
+	aType = BormParticipantType Person ifTrue: [ 
+		^ OPBormEditorIcons personIcon ].
+	aType = BormParticipantType System ifTrue: [ 
+		^ OPBormEditorIcons bormSystemIcon ].
+	aType = BormParticipantType Organization ifTrue: [ 
+		^ OPBormEditorIcons organizationIcon ].
+	^ nil
+]
+
 { #category : 'rendering' }
 BormParticipantShape >> addSelectionDraggableInteraction [
 
@@ -58,7 +69,7 @@ BormParticipantShape >> renderShapeDetails [
 	roassalShape @ labeled.
 
 	icon := RSBitmap new
-		        form: typeIconProvider typeIcon;
+		        form: self typeIcon;
 		        yourself.
 	RSLocation new
 		top;
@@ -87,17 +98,23 @@ BormParticipantShape >> shouldBeResizableByUser [
 	^ true
 ]
 
-{ #category : 'accessing' }
-BormParticipantShape >> typeIconProvider: anObject [
+{ #category : 'rendering' }
+BormParticipantShape >> typeIcon [
+
+	^ self typeIconFor: self modelElement type
+]
+
+{ #category : 'rendering' }
+BormParticipantShape >> typeIconFor: aType [
 
-	typeIconProvider := anObject
+	^ self class typeIconFor: aType
 ]
 
 { #category : 'rendering' }
 BormParticipantShape >> updateRenderFromModel [
 
 	(roassalShape propertyAt: #RSLabeled) text: self modelElement name.
-	icon form: typeIconProvider typeIcon.
+	icon form: self typeIcon.
 	super updateRenderFromModel.
 	roassalShape signalUpdate
 ]

repository/OpenPonk-BormEditor/OPBorm204oppProjectLoadTest.class.st

@@ -0,0 +1,14 @@
+Class {
+	#name : 'OPBorm204oppProjectLoadTest',
+	#superclass : 'OPLegacyProjectLoadTest',
+	#category : 'OpenPonk-BormEditor-Tests',
+	#package : 'OpenPonk-BormEditor',
+	#tag : 'Tests'
+}
+
+{ #category : 'files' }
+OPBorm204oppProjectLoadTest >> base64ProjectZip [
+
+^'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'
+
+]

repository/OpenPonk-BormEditor/OPBorm304oppProjectLoadTest.class.st

@@ -0,0 +1,14 @@
+Class {
+	#name : 'OPBorm304oppProjectLoadTest',
+	#superclass : 'OPLegacyProjectLoadTest',
+	#category : 'OpenPonk-BormEditor-Tests',
+	#package : 'OpenPonk-BormEditor',
+	#tag : 'Tests'
+}
+
+{ #category : 'files' }
+OPBorm304oppProjectLoadTest >> base64ProjectZip [
+
+^'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'
+
+]