Merge 77fb5d2

OpenPonk · Oct 28, 2024 · 1490067 · 1490067
2 parents fba1543 + 77fb5d2
commit 1490067
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 25 deletions.
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetArcController.class.st b/repository/OpenPonk-PetriNets/OPPetriNetArcController.class.st
@@ -10,7 +10,7 @@ Class {
 OPPetriNetArcController >> internalSubscribeTo: aModel [
 
 	super internalSubscribeTo: aModel.
-	aModel when: OPElementRemoved send: #removeController to: self
+	aModel weakWhen: OPElementRemoved send: #removeControllerAndDiagramElement to: self
 ]
 
 { #category : 'testing' }
@@ -21,7 +21,6 @@ OPPetriNetArcController >> isHideable [
 { #category : 'destruction' }
 OPPetriNetArcController >> removeModel [
 
-	self model announcer unsubscribe: self.
 	self diagramController model remove: self model.
 	super removeModel
 ]
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetNodeController.class.st b/repository/OpenPonk-PetriNets/OPPetriNetNodeController.class.st
@@ -55,7 +55,7 @@ OPPetriNetNodeController >> diagramElementClass [
 OPPetriNetNodeController >> internalSubscribeTo: aModel [
 
 	super internalSubscribeTo: aModel.
-	aModel when: OPElementRemoved send: #removeController to: self
+	aModel weakWhen: OPElementRemoved send: #removeControllerAndDiagramElement to: self
 ]
 
 { #category : 'testing' }
@@ -66,7 +66,6 @@ OPPetriNetNodeController >> isHideable [
 { #category : 'destruction' }
 OPPetriNetNodeController >> removeModel [
 
-	self model announcer unsubscribe: self.
 	self diagramController model remove: self model.
 	super removeModel
 ]
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetPTPlaceController.class.st b/repository/OpenPonk-PetriNets/OPPetriNetPTPlaceController.class.st
@@ -40,18 +40,14 @@ OPPetriNetPTPlaceController >> diagramElementClass [
 	^ OPPetriNetPTPlaceShape
 ]
 
+{ #category : 'construction' }
+OPPetriNetPTPlaceController >> internalSubscribeTo: aModel [
+
+	super internalSubscribeTo: aModel.
+	aModel weakWhen: OPPlaceTokensChanged send: #modelChanged to: self
+]
+
 { #category : 'hooks' }
 OPPetriNetPTPlaceController >> modelClass [
 	^ OPPetriNetPTPlace
 ]
-
-{ #category : 'construction' }
-OPPetriNetPTPlaceController >> renderDiagramElement [
-
-	super renderDiagramElement.
-	model
-		when: OPPlaceTokensChanged
-		do: [ self diagramElement modelChanged ]
-		for: self.
-	^ self roassalShape
-]
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetPlayClicked.class.st b/repository/OpenPonk-PetriNets/OPPetriNetPlayClicked.class.st
@@ -0,0 +1,7 @@
+Class {
+	#name : 'OPPetriNetPlayClicked',
+	#superclass : 'Announcement',
+	#category : 'OpenPonk-PetriNets-Announcements',
+	#package : 'OpenPonk-PetriNets',
+	#tag : 'Announcements'
+}
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetTransitionController.class.st b/repository/OpenPonk-PetriNets/OPPetriNetTransitionController.class.st
@@ -22,11 +22,24 @@ OPPetriNetTransitionController >> hookDiagramElement [
 
 	super hookDiagramElement.
 
-	diagramElement whenPlayClickedDo: [ 
-		OPPetriNetSimulationGUI stepSimulatorOfController: self ]
+	self diagramElement whenPlayClickedSend: #playClicked to: self
 ]
 
 { #category : 'hooks' }
 OPPetriNetTransitionController >> modelClass [
 	^ OPPetriNetTransition
 ]
+
+{ #category : 'rendering' }
+OPPetriNetTransitionController >> playClicked [
+
+	OPPetriNetSimulationGUI stepSimulatorOfController: self
+]
+
+{ #category : 'rendering' }
+OPPetriNetTransitionController >> unhookDiagramElement [
+
+	super unhookDiagramElement.
+
+	self diagramElement unsubscribe: self
+]
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetTransitionShape.class.st b/repository/OpenPonk-PetriNets/OPPetriNetTransitionShape.class.st
@@ -2,24 +2,23 @@ Class {
 	#name : 'OPPetriNetTransitionShape',
 	#superclass : 'OPPetriNetNodeShape',
 	#instVars : [
-		'playClickedBlock'
+		'announcer'
 	],
 	#category : 'OpenPonk-PetriNets-Shapes',
 	#package : 'OpenPonk-PetriNets',
 	#tag : 'Shapes'
 }
 
-{ #category : 'hooks' }
-OPPetriNetTransitionShape >> initialize [
+{ #category : 'accessing' }
+OPPetriNetTransitionShape >> announcer [
 
-	super initialize.
-	playClickedBlock := [  ]
+	^ announcer ifNil: [ announcer := Announcer new ]
 ]
 
 { #category : 'hooks' }
 OPPetriNetTransitionShape >> playClicked [
 
-	playClickedBlock value
+	self announcer announce: OPPetriNetPlayClicked
 ]
 
 { #category : 'hooks' }
@@ -70,8 +69,17 @@ OPPetriNetTransitionShape >> selectableInteraction [
 	^ selectableInteraction
 ]
 
+{ #category : 'subscription' }
+OPPetriNetTransitionShape >> unsubscribe: aReceiver [
+
+	^ self announcer unsubscribe: aReceiver
+]
+
 { #category : 'hooks' }
-OPPetriNetTransitionShape >> whenPlayClickedDo: aBlock [
+OPPetriNetTransitionShape >> whenPlayClickedSend: aSelector to: anObject [
 
-	playClickedBlock := aBlock
+	^ self announcer
+		  when: OPPetriNetPlayClicked
+		  send: aSelector
+		  to: anObject
 ]