Code cleanup

OpenPonk · Oct 3, 2024 · d81f0de · d81f0de
1 parent 3155d0b
commit d81f0de
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 24 deletions.
diff --git a/repository/OpenPonk-Core/OPDiagramController.class.st b/repository/OpenPonk-Core/OPDiagramController.class.st
@@ -868,15 +868,15 @@ OPDiagramController >> visibleElements: aCollection [
 ]
 
 { #category : 'accessing' }
-OPDiagramController >> when: anEvent do: aBlock [
+OPDiagramController >> when: anEvent do: aBlock for: aSubscriber [
 
-	^ self announcer when: anEvent do: aBlock for: aBlock receiver
+	^ self announcer when: anEvent do: aBlock for: aSubscriber
 ]
 
 { #category : 'protocol-events' }
-OPDiagramController >> whenAllDeselectedDo: aBlock [
+OPDiagramController >> whenAllDeselectedDo: aBlock for: aSubscriber [
 
-	self when: OPAllFiguresDeselected do: aBlock
+	self when: OPAllFiguresDeselected do: aBlock for: aSubscriber
 ]
 
 { #category : 'protocol-events' }

diff --git a/repository/OpenPonk-Core/OPTestContainerModel.class.st b/repository/OpenPonk-Core/OPTestContainerModel.class.st
@@ -53,6 +53,7 @@ OPTestContainerModel >> uuid: anObject [
 ]
 
 { #category : 'accessing' }
-OPTestContainerModel >> when: anAnnouncement do: aBlock [
-	^ self announcer when: anAnnouncement do: aBlock
+OPTestContainerModel >> when: anAnnouncement do: aBlock for: aSubscriber [
+
+	^ self announcer when: anAnnouncement do: aBlock for: aSubscriber
 ]
diff --git a/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st
@@ -81,7 +81,10 @@ OPRSAnchorConstraint >> build [
 			^ shape isInACanvas
 				  ifTrue: [ self addAnchorAndGuideLine ]
 				  ifFalse: [
-				  shape when: RSShapeAddedEvent do: [ self addAnchorAndGuideLine ] ] ]
+					  shape
+						  when: RSShapeAddedEvent
+						  do: [ self addAnchorAndGuideLine ]
+						  for: self ] ]
 		ifFalse: [
 			shape
 				when: RSMouseLeftDragStart

diff --git a/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st b/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st
@@ -148,12 +148,3 @@ OPRSDraggableControlPoints >> showMidpointHandles [
 	midpointHandles last beNearEnd.
 	midpointHandles do: #render
 ]
-
-{ #category : 'initialization' }
-OPRSDraggableControlPoints >> showOnShape: aLine [
-
-	line := aLine.
-	line when: RSMouseLeftClick do: [ self showHandles ].
-	line when: RSShapeRemovedEvent do: [ self removeHandles ].
-	self connectWithCanvas
-]
diff --git a/repository/OpenPonk-Roassal/OPRSResizable.class.st b/repository/OpenPonk-Roassal/OPRSResizable.class.st
@@ -62,7 +62,10 @@ OPRSResizable >> onShape: aShape [
 	shape isInACanvas
 		ifTrue: [ self connectWithCanvas ]
 		ifFalse: [
-		shape when: RSShapeAddedEvent do: [ self connectWithCanvas ] ].
+			shape
+				when: RSShapeAddedEvent
+				do: [ self connectWithCanvas ]
+				for: self ].
 	shape
 		when: RSMouseDragStart send: #disableHandles: to: self;
 		when: RSMouseDragEnd send: #enableHandles: to: self;

diff --git a/repository/OpenPonk-Roassal/OPRSResize.class.st b/repository/OpenPonk-Roassal/OPRSResize.class.st
@@ -37,4 +37,5 @@ OPRSResize >> stickSameSize [
 	self fixedShape
 		when: RSExtentChangedEvent
 		do: [ :event | block value ]
+		for: self
 ]
diff --git a/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st
@@ -36,7 +36,8 @@ OPRSSelectionDraggableBorder >> createDragBoxes [
 	renderDragBoxes := [ shape canvas addAll: dragBoxes ].
 	shape isInACanvas
 		ifTrue: renderDragBoxes
-		ifFalse: [ shape when: RSShapeAddedEvent do: renderDragBoxes ].
+		ifFalse: [
+		shape when: RSShapeAddedEvent do: renderDragBoxes for: self ].
 	shape
 		when: RSShapeRemovedEvent
 		do: [ dragBoxes do: #remove ]

diff --git a/repository/OpenPonk-Spec/OPModelTreeWidget.class.st b/repository/OpenPonk-Spec/OPModelTreeWidget.class.st
@@ -122,11 +122,14 @@ OPModelTreeWidget >> openCommand: aDiagram [
 { #category : 'accessing' }
 OPModelTreeWidget >> openOn: aProject [
 
-	self workbench announcer when: OPEditorFocused do: [ :event | 
-		project ifNotNil: [ project unsubscribe: self ].
-		project := event diagramController model.
-		project ifNotNil: [ project whenChanged: [ self refresh ] ].
-		self refresh ].
+	self workbench
+		when: OPEditorFocused
+		do: [ :event |
+			project ifNotNil: [ project unsubscribe: self ].
+			project := event diagramController model.
+			project ifNotNil: [ project whenChanged: [ self refresh ] ].
+			self refresh ]
+		for: self.
 	tree expandRoots
 ]
 

diff --git a/repository/OpenPonk-Spec/OPPalette.class.st b/repository/OpenPonk-Spec/OPPalette.class.st
@@ -71,7 +71,7 @@ OPPalette >> createPaletteFor: aDiagramController [
 		addAllToPalette: self
 		forController: diagramController.
 	self selectSelectionTool.
-	diagramController whenAllDeselectedDo: [ self selectSelectionTool ]
+	diagramController whenAllDeselectedDo: [ self selectSelectionTool ] for: self
 ]
 
 { #category : 'building widgets' }

diff --git a/repository/OpenPonk-Spec/OPWorkbench.class.st b/repository/OpenPonk-Spec/OPWorkbench.class.st
@@ -341,6 +341,12 @@ OPWorkbench >> updateTitle [
 	^ self withWindowDo: [ :window | window title: self title ]
 ]
 
+{ #category : 'protocol' }
+OPWorkbench >> when: anEvent do: aBlock for: aSubscriber [
+
+	^ self announcer when: anEvent do: aBlock for: aSubscriber
+]
+
 { #category : 'accessing - spec' }
 OPWorkbench >> workbench [
 	^ self