Pass on references to BlOSpace (removing them)

src/Bloc-Alexandrie-Tests/BlCompositeBackgroundTest.extension.st

@@ -4,11 +4,11 @@ Extension { #name : #BlCompositeBackgroundTest }
 BlCompositeBackgroundTest >> testAeApplyTo [
 
 	| space background blElement backgroundList |
-	space := BlOSpace new.
+	space := BlSpace new.
 
 	backgroundList := OrderedCollection with: (BlBackground paint: Color blue).
 	background := BlCompositeBackground withAll: backgroundList.
-	blElement := BlElement new background: background.
+	blElement := BlElement new background: background; yourself.
 	space root addChild: blElement.
 
 	space aeAsForm. "check no errors"

src/Bloc-Alexandrie-Tests/BlSpaceBuilder.class.st

@@ -135,12 +135,18 @@ BlSpaceBuilder >> initialize [
 
 	super initialize.
 
-	space := BlOSpace new.
+	space := BlSpace new.
 	spaceExtent := 100 asPoint.
 	host := BlOSWindowSDL2Host new.
 
 	random := Random seed: 7.
-	alphabetGenerator := Generator on: [ :generator |
+	alphabetGenerator := self newAlphabetGenerator
+]
+
+{ #category : #initialization }
+BlSpaceBuilder >> newAlphabetGenerator [
+
+	^ Generator on: [ :generator |
 		| index |
 		index := 1.
 		[ 	Character alphabet do: [ :each |
@@ -150,8 +156,7 @@ BlSpaceBuilder >> initialize [
 					ifTrue: [ '' ]
 					ifFalse: [ index asString ].
 				generator yield: next, suffix ].
-			index := index + 1 ] repeat ].
-
+			index := index + 1 ] repeat ]
 ]
 
 { #category : #'instance creation' }

src/Bloc-Alexandrie/BAAxisAlignedCompositionLayer.class.st

@@ -18,7 +18,8 @@ Class {
 		'element',
 		'pattern'
 	],
-	#category : 'Bloc-Alexandrie-Utility',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Utility',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Utility'
 }

src/Bloc-Alexandrie/BABufferSpaceRenderer.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BABufferSpaceRenderer',
 	#superclass : 'BASpaceRenderer',
-	#category : 'Bloc-Alexandrie-Renderer',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Renderer',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Renderer'
 }

src/Bloc-Alexandrie/BACanvasTextMeasurer.class.st

@@ -4,7 +4,8 @@ Class {
 	#instVars : [
 		'aeCanvas'
 	],
-	#category : 'Bloc-Alexandrie-Text',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text'
 }

src/Bloc-Alexandrie/BAFontConverter.class.st

@@ -9,7 +9,8 @@ Class {
 	#classInstVars : [
 		'uniqueInstance'
 	],
-	#category : 'Bloc-Alexandrie-Fonts',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Fonts',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Fonts'
 }

src/Bloc-Alexandrie/BAFormSpaceRenderer.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BAFormSpaceRenderer',
 	#superclass : 'BASpaceRenderer',
-	#category : 'Bloc-Alexandrie-Renderer',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Renderer',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Renderer'
 }

src/Bloc-Alexandrie/BAMockedTextMeasurer.class.st

@@ -10,7 +10,8 @@ Class {
 		'measuredHeight',
 		'textOffset'
 	],
-	#category : 'Bloc-Alexandrie-Text-Mocked',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text-Mocked',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text-Mocked'
 }

src/Bloc-Alexandrie/BAMockedTextParagraphSpan.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BAMockedTextParagraphSpan',
 	#superclass : 'BATextParagraphLeaf',
-	#category : 'Bloc-Alexandrie-Text-Mocked',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text-Mocked',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text-Mocked'
 }

src/Bloc-Alexandrie/BAOffscreen.class.st

@@ -13,7 +13,8 @@ Class {
 	#classInstVars : [
 		'instance'
 	],
-	#category : 'Bloc-Alexandrie-Utility',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Utility',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Utility'
 }

src/Bloc-Alexandrie/BARenderer.class.st

@@ -6,7 +6,8 @@ Both buffer and form host-spaces are supported.
 Class {
 	#name : 'BARenderer',
 	#superclass : 'BlHostRenderer',
-	#category : 'Bloc-Alexandrie-Renderer',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Renderer',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Renderer'
 }

src/Bloc-Alexandrie/BASpaceRenderer.class.st

@@ -4,7 +4,8 @@ Class {
 	#instVars : [
 		'aeCanvas'
 	],
-	#category : 'Bloc-Alexandrie-Renderer',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Renderer',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Renderer'
 }

src/Bloc-Alexandrie/BASpaceTextMeasurer.class.st

@@ -4,7 +4,8 @@ Class {
 	#instVars : [
 		'spaceRenderer'
 	],
-	#category : 'Bloc-Alexandrie-Text',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text'
 }

src/Bloc-Alexandrie/BATextElementMockedMeasurer.class.st

@@ -4,7 +4,8 @@ Class {
 	#instVars : [
 		'measurer'
 	],
-	#category : 'Bloc-Alexandrie-Text-Mocked',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text-Mocked',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text-Mocked'
 }

src/Bloc-Alexandrie/BATextMeasurer.class.st

@@ -4,7 +4,8 @@ Class {
 	#instVars : [
 		'lineAdvance'
 	],
-	#category : 'Bloc-Alexandrie-Text',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text'
 }

src/Bloc-Alexandrie/BATextParagraphLeaf.class.st

@@ -8,7 +8,8 @@ Class {
 	#classVars : [
 		'TabStopWidth'
 	],
-	#category : 'Bloc-Alexandrie-Text',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text'
 }

src/Bloc-Alexandrie/BATextParagraphSpan.class.st

@@ -4,7 +4,8 @@ I represent an Alexandrie specific measured span
 Class {
 	#name : 'BATextParagraphSpan',
 	#superclass : 'BATextParagraphLeaf',
-	#category : 'Bloc-Alexandrie-Text',
+	#package : 'Bloc',
+	#tag : 'Alexandrie-Text',
 	#package : 'Bloc-Alexandrie',
 	#tag : 'Text'
 }

src/Bloc-DevTool/BlDevHalosEventListenerExample.class.st

@@ -25,7 +25,7 @@ BlDevHalosEventListenerExample >> activatedHalos [
 	anEvent modifiers
 		alt: true;
 		shift: true.
-	BlOSpace simulateEvent: anEvent on: (aContainer childAt: 1).
+	BlSpace simulateEvent: anEvent on: (aContainer childAt: 1).
 
 	theNewElements := aSpace children asArray.
 	"self assert: theNewElements size equals: thePriorElements size + 1."
@@ -86,7 +86,7 @@ BlDevHalosEventListenerExample >> newSpace [
 
 	<sampleInstance>
 	| aSpace |
-	aSpace := BlOSpace new.
+	aSpace := BlSpace new.
 	aSpace host: BlHeadlessHost new.
 	aSpace title: 'Async Element Examples'.
 	aSpace extent: 600 @ 400.
@@ -96,14 +96,14 @@ BlDevHalosEventListenerExample >> newSpace [
 
 { #category : #utility }
 BlDevHalosEventListenerExample >> putInSpace: aBlElement [
-
 	<sampleInstance>
+
 	| aSpace |
 	self
 		assert: [ aBlElement isNotNil ]
 		description: [ 'Element must be non-nil' ].
 	aSpace := self newSpace.
-	aSpace addChild: aBlElement.
+	aSpace root addChild: aBlElement.
 	^ aSpace
 ]
 

src/Bloc-Examples/BlAnimationExamples.class.st

@@ -47,7 +47,7 @@ BlAnimationExamples class >> ballsAnim [
 				alp }.
 		els add: el ].
 
-	space := BlOSpace new.
+	space := BlSpace new.
 	space root addChildren: els.
 	space show.
 
@@ -88,7 +88,7 @@ BlAnimationExamples class >> sequential [
 		           position: 100 @ 100.
 	element addAnimation: sequential.
 
-	space := BlOSpace new.
+	space := BlSpace new.
 	space root addChild: element.
 	space show
 ]

src/Bloc-Examples/BlErrorHandlingExamples.class.st

@@ -114,9 +114,9 @@ BlErrorHandlingExamples >> sceneWith: aFaultyElement [
 
 	aContainer addChildren: { aLeftChild . aRightChild }.
 
-	aSpace := BlOSpace new.
+	aSpace := BlSpace new.
 	aSpace host: BlMorphicWindowHost new.
-	aSpace addChild: aContainer.
+	aSpace root addChild: aContainer.
 	aSpace show.
 	aSpace pulse.
 	aSpace close.

src/Bloc-Examples/BlMouseProcessorExamples.class.st

@@ -58,7 +58,7 @@ BlMouseProcessorExamples >> mouseProcessor [
 	| aMouseProcessor aSpace |
 	<gtExample>
 
-	aSpace := BlOSpace new.
+	aSpace := BlSpace new.
 	aMouseProcessor := BlMouseProcessor space: aSpace.
 
 	self assert: aMouseProcessor space equals: aSpace.

src/Bloc-Examples/BlSharedEventDistributorExamples.class.st

@@ -94,7 +94,7 @@ BlSharedEventDistributorExamples >> mouseEnterEventOneOutOfTwoElements [
 	anElementOne when: BlMouseEnterEvent do: [ aMouseEnterOne := aMouseEnterOne + 1 ].
 	anElementTwo when: BlMouseEnterEvent do: [ aMouseEnterTwo := aMouseEnterTwo + 1 ].
 
-	BlOSpace simulateMouseMoveInside: anElementOne.
+	BlSpace simulateMouseMoveInside: anElementOne.
 
 	self assert: aMouseEnterOne equals: 1.
 	self assert: aMouseEnterTwo equals: 1.
@@ -105,6 +105,7 @@ BlSharedEventDistributorExamples >> mouseEnterEventOneOutOfTwoElements [
 { #category : #'examples - sharing events' }
 BlSharedEventDistributorExamples >> mouseLeaveEventOneOutOfTwoElements [
 	<gtExample>
+
 	| aHandler anElements aContainer aMouseLeaveTwo aMouseLeaveOne anElementOne anElementTwo |
 	aMouseLeaveOne := aMouseLeaveTwo := 0.
 	aHandler := self installTwoElements.
@@ -118,10 +119,16 @@ BlSharedEventDistributorExamples >> mouseLeaveEventOneOutOfTwoElements [
 	anElementOne when: BlMouseLeaveEvent do: [ aMouseLeaveOne := aMouseLeaveOne + 1 ].
 	anElementTwo when: BlMouseLeaveEvent do: [ aMouseLeaveTwo := aMouseLeaveTwo + 1 ].
 
-	BlOSpace
+	BlSpace
 		simulateEvents: {
-			BlMouseMoveEvent new position: (BlOSpace locationInside: anElementOne); screenPosition: 0@0.
-			BlMouseMoveEvent new position: (BlOSpace locationOutside: aContainer); screenPosition: 0@0 }
+			BlMouseMoveEvent new
+				position: (BlSpace locationInside: anElementOne);
+				screenPosition: 0@0;
+				yourself.
+			BlMouseMoveEvent new
+				position: (BlSpace locationOutside: aContainer);
+				screenPosition: 0@0;
+				yourself }
 		on: aContainer.
 
 	self assert: aMouseLeaveOne equals: 1.

src/Bloc-Examples/BlSpaceEventExamples.class.st

@@ -28,8 +28,10 @@ BlSpaceEventExamples >> ignoreSpaceEventsAfterCloseRequest [
 { #category : #'instance creation' }
 BlSpaceEventExamples >> space [
 	<gtExample>
-
-	^ BlOSpace new host: BlHeadlessHost new
+
+	^ BlSpace new
+		  host: BlHeadlessHost new;
+		  yourself
 ]
 
 { #category : #'show / close' }

src/Bloc-Examples/BlTaskTest.class.st

@@ -14,7 +14,7 @@ BlTaskTest >> testAddElementWithTaskToSpace [
 
 	| anElement aSpace aTask |
 	anElement := self testAddTaskToTheElementWithoutSpace.
-	aSpace := BlOSpace new.
+	aSpace := BlSpace new.
 	aSpace root addChild: anElement.
 	"task were moved to the space"
 	self assert: anElement taskQueue tasks isEmpty.

src/Bloc-Examples/TBlExample.trait.st

@@ -9,10 +9,12 @@ Trait {
 { #category : #opening }
 TBlExample classSide >> openInWindow: anElement named: aTitleString extent: aPoint [
 	"Open a given element in a window of a provided extent and specified title"
+
 	| aSpace |
-	aSpace := BlOSpace new
+	aSpace := BlSpace new
 		extent: aPoint;
-		title: aTitleString.
+		title: aTitleString;
+		yourself.
 
 	aSpace root background: self spaceBackground.
 	aSpace root addChild: anElement.

src/Bloc-Layout-Resizer/BlLayoutHorizontalExactResizerState.class.st

@@ -1,6 +1,7 @@
 Class {
 	#name : 'BlLayoutHorizontalExactResizerState',
 	#superclass : 'BlLayoutHorizontalResizerState',
-	#category : 'Bloc-Layout-Resizer',
+	#package : 'Bloc',
+	#tag : 'Layout-Resizer',
 	#package : 'Bloc-Layout-Resizer'
 }

src/Bloc-Layout-Resizer/BlLayoutHorizontalFitContentLimitedResizerState.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BlLayoutHorizontalFitContentLimitedResizerState',
 	#superclass : 'BlLayoutHorizontalResizerState',
-	#category : 'Bloc-Layout-Resizer',
+	#package : 'Bloc',
+	#tag : 'Layout-Resizer',
 	#package : 'Bloc-Layout-Resizer'
 }
 

src/Bloc-Layout-Resizer/BlLayoutHorizontalFitContentResizerState.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BlLayoutHorizontalFitContentResizerState',
 	#superclass : 'BlLayoutHorizontalResizerState',
-	#category : 'Bloc-Layout-Resizer',
+	#package : 'Bloc',
+	#tag : 'Layout-Resizer',
 	#package : 'Bloc-Layout-Resizer'
 }
 

src/Bloc-Layout-Resizer/BlLayoutHorizontalLocalResizerState.class.st

@@ -1,6 +1,7 @@
 Class {
 	#name : 'BlLayoutHorizontalLocalResizerState',
 	#superclass : 'BlLayoutHorizontalResizerState',
-	#category : 'Bloc-Layout-Resizer',
+	#package : 'Bloc',
+	#tag : 'Layout-Resizer',
 	#package : 'Bloc-Layout-Resizer'
 }

src/Bloc-Layout-Resizer/BlLayoutHorizontalMatchParentResizerState.class.st

@@ -1,7 +1,8 @@
 Class {
 	#name : 'BlLayoutHorizontalMatchParentResizerState',
 	#superclass : 'BlLayoutHorizontalResizerState',
-	#category : 'Bloc-Layout-Resizer',
+	#package : 'Bloc',
+	#tag : 'Layout-Resizer',
 	#package : 'Bloc-Layout-Resizer'
 }