Merge 8227976

OpenPonk · Oct 28, 2024 · b52e237 · b52e237
2 parents 1abddeb + 8227976
commit b52e237
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/repository/OpenPonk-FSM/OPFsmSimulator.class.st b/repository/OpenPonk-FSM/OPFsmSimulator.class.st
@@ -156,6 +156,7 @@ OPFsmSimulator >> initializePresenters [
 { #category : 'as yet unclassified' }
 OPFsmSimulator >> initializeWindow: aWindow [
 
+	super initializeWindow: aWindow.
 	aWindow initialExtent: 400 @ 300.
 	aWindow title: 'Finite State Machine Simulator'
 ]
@@ -201,6 +202,7 @@ OPFsmSimulator >> nextButton [
 OPFsmSimulator >> openOn: aDiagramController [
 
 	diagramController := aDiagramController.
+	self application: aDiagramController editor application.
 	self open
 ]
 

diff --git a/repository/OpenPonk-FSM/OPFsmStateShape.class.st b/repository/OpenPonk-FSM/OPFsmStateShape.class.st
@@ -20,6 +20,14 @@ Class {
 	#tag : 'Shapes'
 }
 
+{ #category : 'removing' }
+OPFsmStateShape >> removeRender [
+
+	super removeRender.
+	label := nil.
+	innerCircle := nil
+]
+
 { #category : 'accessing' }
 OPFsmStateShape >> renderBasicShape [
 

diff --git a/repository/OpenPonk-FSM/OPFsmTransitionController.class.st b/repository/OpenPonk-FSM/OPFsmTransitionController.class.st
@@ -20,7 +20,7 @@ OPFsmTransitionController >> diagramElementClass [
 OPFsmTransitionController >> internalSubscribeTo: aModel [
 
 	super internalSubscribeTo: aModel.
-	aModel when: OPElementRemoved send: #removeController to: self
+	aModel weakWhen: OPElementRemoved send: #removeControllerAndDiagramElement to: self
 ]
 
 { #category : 'testing' }
@@ -36,7 +36,6 @@ OPFsmTransitionController >> modelClass [
 { #category : 'destruction' }
 OPFsmTransitionController >> removeModel [
 
-	self model announcer unsubscribe: self.
 	self diagramController model remove: self model.
 	super removeModel
 ]
diff --git a/repository/OpenPonk-FSM/OPFsmVertexController.class.st b/repository/OpenPonk-FSM/OPFsmVertexController.class.st
@@ -86,7 +86,7 @@ OPFsmVertexController >> hookDiagramElement [
 OPFsmVertexController >> internalSubscribeTo: aModel [
 
 	super internalSubscribeTo: aModel.
-	aModel when: OPElementRemoved send: #removeController to: self
+	aModel weakWhen: OPElementRemoved send: #removeControllerAndDiagramElement to: self
 ]
 
 { #category : 'testing' }
@@ -97,7 +97,15 @@ OPFsmVertexController >> isHideable [
 { #category : 'destruction' }
 OPFsmVertexController >> removeModel [
 
-	self model announcer unsubscribe: self.
 	self diagramController model remove: self model.
 	super removeModel
 ]
+
+{ #category : 'figures' }
+OPFsmVertexController >> unhookDiagramElement [
+
+	super unhookDiagramElement.
+
+	(self diagramElement ifNotExists: [ ^ self ])
+		adornmentCreationBlock: [ :builder |  ]
+]