Fixed a memory leak, code cleanup

OpenPonk · Oct 19, 2024 · 871d800 · 871d800
1 parent 381e5da
commit 871d800
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 93 deletions.
diff --git a/repository/OpenPonk-ClassEditor/OPAbstractUmlShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPAbstractUmlShapeTest.class.st
@@ -28,7 +28,7 @@ OPAbstractUmlShapeTest >> testAddOwnedElement [
 	parent := self newShapeInstance.
 	child := self newShapeInstance.
 	child owningElement: parent.
-	self assert: parent owningElement equals: nil.
+	self assert: parent owningElement doesNotExist.
 	self assert: child owningElement equals: parent.
 	self assertCollection: parent ownedElements hasSameElements: {child}.
 	self assert: child ownedElements size equals: 0
@@ -49,7 +49,7 @@ OPAbstractUmlShapeTest >> testAddSelfEdge [
 { #category : 'tests' }
 OPAbstractUmlShapeTest >> testEmpty [
 	self assert: shape modelElement isNil.
-	self assert: shape owningElement isNil.
+	self assert: shape owningElement doesNotExist.
 	self assert: shape ownedElements isEmpty.
 	self assert: shape sourceEdges isEmpty.
 	self assert: shape targetEdges isEmpty

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationShape.class.st
@@ -4,14 +4,6 @@ I am a shape composition to accomodate for the most common UML Association shape
 Class {
 	#name : 'OPUmlAssociationShape',
 	#superclass : 'OPUmlEdge',
-	#instVars : [
-		'nameLabel',
-		'sourceEndLabels',
-		'targetEndLabels',
-		'constraints',
-		'stereotypeLabel',
-		'propertiesLabel'
-	],
 	#category : 'OpenPonk-ClassEditor-Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Shapes'

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAttributeController.class.st b/repository/OpenPonk-ClassEditor/OPUmlAttributeController.class.st
@@ -12,7 +12,7 @@ Class {
 { #category : 'figures' }
 OPUmlAttributeController >> addDiagramElementToOwner [
 
-	self diagramElementOwner addAttribute: diagramElement
+	self ownerDiagramElement addAttribute: diagramElement
 ]
 
 { #category : 'figures' }
@@ -153,20 +153,19 @@ OPUmlAttributeController >> diagramElementClass [
 	^ OPUmlAttributeLabel
 ]
 
-{ #category : 'diagram elements' }
-OPUmlAttributeController >> diagramElementOwner [
-
-	^ (diagramController controllerForModel:
-		   (model owningClass ifNil: [ 
-			    (model owningAssociation memberEnds detect: [ :any | 
-				     any ~= model ]) type ])) diagramElement
-]
-
 { #category : 'accessing' }
 OPUmlAttributeController >> modelClass [
 	^ OPUMLProperty
 ]
 
+{ #category : 'diagram elements' }
+OPUmlAttributeController >> owner [
+
+	^ diagramController controllerForModel: (model owningClass ifNil: [
+			   (model owningAssociation memberEnds detect: [ :any |
+				    any ~= model ]) type ])
+]
+
 { #category : 'hooks' }
 OPUmlAttributeController >> placeholderName [
 
@@ -193,10 +192,10 @@ OPUmlAttributeController >> registerModelInContainer: aClass [
 { #category : 'removing' }
 OPUmlAttributeController >> removeDiagramElement [
 
-	self diagramElement ifNil: [ ^ self ].
-	self diagramElementOwner ifNotNil: [ :owner |
+	self diagramElement ifNotExists: [ ^ self ].
+	self ownerDiagramElement ifExists: [ :owner |
 		owner removeAttribute: self diagramElement ].
-	diagramElement := nil
+	self diagramElement: OPNoShape new
 ]
 
 { #category : 'removing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAttributeControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlAttributeControllerTest.class.st
@@ -114,7 +114,7 @@ OPUmlAttributeControllerTest >> testRemoveFromView [
 	diagramController showInDiagramModel: class.
 	controller := diagramController controllerForModel: prop.
 	compartment := controller diagramElement owningElement.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: compartment ownedElements asArray equals: #()
 ]
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassControllerTest.class.st
@@ -77,7 +77,7 @@ OPUmlClassControllerTest >> testRemoveWithAttribute [
 	class ownedAttributes add: OPUMLProperty new.
 	controller model: class.
 	controller showWithoutDependentInDiagram: diagramController.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: diagramController canvas nodes asArray equals: #(  ).
 	self assert: diagramController controllers asArray equals: #(  )
 ]

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierController.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierController.class.st
@@ -94,6 +94,15 @@ OPUmlClassifierController >> registerModelInContainer: aParentModel [
 	aParentModel packagedElements add: model
 ]
 
+{ #category : 'construction' }
+OPUmlClassifierController >> unhookDiagramElement [
+
+	super unhookDiagramElement.
+
+	(self diagramElement ifNotExists: [ ^ self ])
+		adornmentCreationBlock: [ :builder |  ]
+]
+
 { #category : 'event handling' }
 OPUmlClassifierController >> updateAfterDiagramFocused [
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierControllerTest.class.st
@@ -32,7 +32,7 @@ OPUmlClassifierControllerTest >> testRemoveEmpty [
 
 	controller model: model.
 	controller showWithoutDependentInDiagram: diagramController.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: diagramController canvas nodes asArray equals: #(  ).
 	self assert: diagramController controllers asArray equals: #(  )
 ]

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierItemController.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierItemController.class.st
@@ -15,8 +15,8 @@ OPUmlClassifierItemController >> addDiagramElementToOwner [
 { #category : 'figures' }
 OPUmlClassifierItemController >> createDiagramElement [
 
-	diagramElement := self diagramElementClass forModelElement:
-		                  self model.
+	self diagramElement:
+		(self diagramElementClass forModelElement: self model).
 
 	self addDiagramElementToOwner
 ]
@@ -35,15 +35,6 @@ OPUmlClassifierItemController >> descriptionName [
 	^ description
 ]
 
-{ #category : 'announcements' }
-OPUmlClassifierItemController >> internalSubscribeTo: aModel [
-
-	aModel announcer
-		when: OPElementRenamed
-		do: [ self diagramElementOwner modelChanged ]
-		for: self
-]
-
 { #category : 'testing' }
 OPUmlClassifierItemController >> isHideable [
 	^ true

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierNameLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierNameLabel.class.st
@@ -44,9 +44,10 @@ OPUmlClassifierNameLabel >> isPositionableByUser [
 { #category : 'removing' }
 OPUmlClassifierNameLabel >> removeRender [
 
-	(self owningElement roassalShape ifNil: [ ^ super removeRender ]) 
-		removeInteractionIfPresent: OPRSLabeled.
-	super removeRender
+	self owningElement roassalShape ifNotNil: [ :owningRoassalShape |
+		owningRoassalShape removeInteractionIfPresent: OPRSLabeled ].
+	super removeRender.
+	labeled := nil
 ]
 
 { #category : 'as yet unclassified' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShape.class.st
@@ -99,7 +99,7 @@ OPUmlCompartmentableShape >> removeRender [
 
 	super removeRender.
 	separators do: #remove.
-	separators := OrderedCollection new
+	separators removeAll
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShapeTest.class.st
@@ -112,6 +112,6 @@ OPUmlCompartmentableShapeTest >> testRemoveOwnedElement [
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
 	self assertCollection: shape ownedElements hasSameElements: { lbl }.
-	lbl owningElement: nil.
+	lbl owningElement: OPNoShape new.
 	self assert: shape ownedElements isEmpty
 ]
diff --git a/repository/OpenPonk-ClassEditor/OPUmlEdgeTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlEdgeTest.class.st
@@ -25,10 +25,11 @@ OPUmlEdgeTest >> shapeClass [
 
 { #category : 'tests' }
 OPUmlEdgeTest >> testRemove [
+
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
-	self assert: shape ownedElements asArray equals: {lbl}.
-	lbl owningElement: nil.
+	self assert: shape ownedElements asArray equals: { lbl }.
+	lbl owningElement: OPNoShape new.
 	self assert: shape ownedElements isEmpty
 ]
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumLiteralControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumLiteralControllerTest.class.st
@@ -72,6 +72,6 @@ OPUmlEnumLiteralControllerTest >> testRemoveFromView [
 	diagramController showInDiagramModel: class.
 	controller := diagramController controllerForModel: prop.
 	compartment := controller diagramElement owningElement.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: compartment ownedElements asArray equals: #(  )
 ]
diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationControllerTest.class.st
@@ -28,7 +28,7 @@ OPUmlEnumerationControllerTest >> testRemoveWithLiteral [
 	model ownedLiterals add: OPUMLEnumerationLiteral new.
 	controller model: model.
 	controller showWithoutDependentInDiagram: diagramController.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: diagramController canvas nodes asArray equals: #(  ).
 	self assert: diagramController controllers asArray equals: #(  )
 ]

diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st
@@ -12,7 +12,7 @@ Class {
 { #category : 'figures' }
 OPUmlEnumerationLiteralController >> addDiagramElementToOwner [
 
-	self diagramElementOwner addLiteral: diagramElement
+	self ownerDiagramElement addLiteral: diagramElement
 ]
 
 { #category : 'construction' }
@@ -35,18 +35,18 @@ OPUmlEnumerationLiteralController >> diagramElementClass [
 	^ OPUmlEnumerationLiteralLabel
 ]
 
-{ #category : 'diagram elements' }
-OPUmlEnumerationLiteralController >> diagramElementOwner [
-
-	^ (diagramController showWithoutDependentInDiagramModel:
-		   model enumeration) diagramElement
-]
-
 { #category : 'accessing' }
 OPUmlEnumerationLiteralController >> modelClass [
 	^ OPUMLEnumerationLiteral
 ]
 
+{ #category : 'diagram elements' }
+OPUmlEnumerationLiteralController >> owner [
+
+	^ diagramController showWithoutDependentInDiagramModel:
+		  model enumeration
+]
+
 { #category : 'hooks' }
 OPUmlEnumerationLiteralController >> placeholderName [
 
@@ -62,9 +62,9 @@ OPUmlEnumerationLiteralController >> registerModelInContainer: aParentModel [
 { #category : 'removing' }
 OPUmlEnumerationLiteralController >> removeDiagramElement [
 
-	self diagramElement ifNil: [ ^ self ].
-	self diagramElementOwner removeLiteral: self diagramElement.
-	diagramElement := nil
+	self diagramElement ifNotExists: [ ^ self ].
+	self ownerDiagramElement removeLiteral: self diagramElement.
+	self diagramElement: OPNoShape new
 ]
 
 { #category : 'removing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlExtensionShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlExtensionShape.class.st
@@ -4,9 +4,6 @@ I represent an Extension shape
 Class {
 	#name : 'OPUmlExtensionShape',
 	#superclass : 'OPUmlAssociationShape',
-	#instVars : [
-		'isRequiredLabel'
-	],
 	#category : 'OpenPonk-ClassEditor-Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Shapes'

diff --git a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationController.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationController.class.st
@@ -57,7 +57,7 @@ OPUmlGeneralizationController >> descriptionGeneralizationSet [
 					   self parentPackageDo: [ :parentPackage |
 						   parentPackage packagedElements:
 							   parentPackage packagedElements \ setsToRemove , setsToAdd ].
-					   diagramElement ifNotNil: [ self diagramElement modelChanged ] ]);
+					   self diagramElement modelChanged ]);
 		  classes: { OPUmlGeneralizationSetDescriptions };
 		  label: 'Generalization Sets';
 		  priority: 5;

diff --git a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationSetDescriptions.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationSetDescriptions.class.st
@@ -40,9 +40,7 @@ OPUmlGeneralizationSetDescriptions >> descriptionAccessor: aSymbol [
 			  { controller model } asSet , set generalizations
 				  collect: [ :each |
 				  controller diagramController controllerForModel: each ]
-				  thenDo: [ :ctrl |
-					  ctrl diagramElement ifNotNil: [
-						  ctrl diagramElement modelChanged ] ] ]
+				  thenDo: [ :ctrl | ctrl diagramElement modelChanged ] ]
 ]
 
 { #category : 'forms' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st
@@ -4,10 +4,6 @@ I represent a direct generalization line.
 Class {
 	#name : 'OPUmlGeneralizationShape',
 	#superclass : 'OPUmlEdge',
-	#instVars : [
-		'nameLabel',
-		'constraints'
-	],
 	#category : 'OpenPonk-ClassEditor-Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Shapes'

diff --git a/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st b/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st
@@ -12,7 +12,7 @@ Class {
 { #category : 'figures' }
 OPUmlOperationController >> addDiagramElementToOwner [
 
-	self diagramElementOwner addOperation: diagramElement
+	self ownerDiagramElement addOperation: diagramElement
 ]
 
 { #category : 'construction' }
@@ -39,18 +39,17 @@ OPUmlOperationController >> diagramElementClass [
 	^ OPUmlOperationLabel
 ]
 
-{ #category : 'diagram elements' }
-OPUmlOperationController >> diagramElementOwner [
-
-	^ (diagramController controllerForModel: model owningClass)
-		  diagramElement
-]
-
 { #category : 'accessing' }
 OPUmlOperationController >> modelClass [
 	^ OPUMLOperation
 ]
 
+{ #category : 'diagram elements' }
+OPUmlOperationController >> owner [
+
+	^ diagramController controllerForModel: model owningClass
+]
+
 { #category : 'hooks' }
 OPUmlOperationController >> placeholderName [
 
@@ -66,8 +65,8 @@ OPUmlOperationController >> registerModelInContainer: aParentModel [
 { #category : 'removing' }
 OPUmlOperationController >> removeDiagramElement [
 
-	self diagramElement ifNil: [ ^ self ].
-	self diagramElementOwner ifNotNil: [ :owner |
+	self diagramElement ifNotExists: [ ^ self ].
+	self ownerDiagramElement ifNotNil: [ :owner |
 		owner removeOperation: self diagramElement ].
-	diagramElement := nil
+	self diagramElement: OPNoShape new
 ]
diff --git a/repository/OpenPonk-ClassEditor/OPUmlOperationControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlOperationControllerTest.class.st
@@ -41,6 +41,6 @@ OPUmlOperationControllerTest >> testRemoveFromView [
 	diagramController showInDiagramModel: class.
 	controller := diagramController controllerForModel: op.
 	compartment := controller diagramElement owningElement.
-	controller removeController.
+	controller removeControllerAndDiagramElement.
 	self assert: compartment ownedElements asArray equals: #(  )
 ]
diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageController.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageController.class.st
@@ -107,7 +107,7 @@ OPUmlPackageController >> modelClass [
 { #category : 'updating' }
 OPUmlPackageController >> packageRenderChanged [
 
-	self diagramElement ifNotNil: [ :foundDE |
+	self diagramElement ifExists: [ :foundDE |
 		(foundDE hiddenPackages: self hiddenPackages) ifTrue: [
 			foundDE isRendered ifTrue: [ foundDE updateRenderFromModel ] ] ].
 	self diagramController propagatePackageRenderChangedIn: self model
@@ -130,7 +130,7 @@ OPUmlPackageController >> registerModelInContainer: aParentModel [
 { #category : 'destruction' }
 OPUmlPackageController >> removeDiagramElement [
 
-	self diagramElement ifNil: [ ^ self ].
+	self diagramElement ifNotExists: [ ^ self ].
 	super removeDiagramElement.
 	self packageRenderChanged
 ]
@@ -143,6 +143,15 @@ OPUmlPackageController >> renderDiagramElement [
 	self pushBack
 ]
 
+{ #category : 'diagram elements' }
+OPUmlPackageController >> unhookDiagramElement [
+
+	super unhookDiagramElement.
+
+	(self diagramElement ifNotExists: [ ^ self ])
+		innerRoassalShapesBlock: [ Array empty ]
+]
+
 { #category : 'event handling' }
 OPUmlPackageController >> updateAfterDiagramFocused [