cleaned-up ToMultiSelectElement + optimize command appliers (removed …

…all event uses - optimization after after Pablo remark about overused events )

src/Toplo-Examples/ToSandBox.class.st

@@ -3871,7 +3871,7 @@ ToSandBox class >> example_selectWithEditingMultiSelectionWithAllClassNames [
 	innerWindow := ToInnerWindow new.
 	select popupWindowManager anchorRoot: innerWindow root.
 	select hMatchParent.
-	select popupListDataAccessor updateAllWith:
+	select popupListElement dataAccessor updateAllWith:
 		(Smalltalk globals allClasses collect: [ :cls | cls name ]).
 
 	innerWindow pane addChild: select.

src/Toplo-Widget-Album-Tests/ToLabelTest.class.st

@@ -111,43 +111,49 @@ ToLabelTest >> testTextChangePreserveAttributes2 [
 	" test if changing the text of a ToLabel do rebuild its skin  "
 
 	| label hugeFontSize attributes fontSizeAttr prevAttributes |
+	self flag: 'To check'.
 	hugeFontSize := 60.
 
 	label := ToLabel text: 'Hello'.
 	space root addChild: label.
+	space applyAllSkinPhases.
 	attributes := label text attributesAt: 1.
-
 	" skin default attributes  "
 	self assert: attributes notEmpty.
 
 	label defaultFontSize: hugeFontSize.
-	space applyAllSkinPhases.
 	fontSizeAttr := label text iterator
 		                detectAttribute: [ :a |
 		                a isKindOf: BlFontSizeDefaultAttribute ]
 		                ifFound: [ :a | a ]
 		                ifNone: [
 		                self fail:
 			                'should have a BlFontSizeDefaultAttribute' ].
-	" remember taht the skin drives the look so the font size is not applied here "
-	self deny: fontSizeAttr size equals: hugeFontSize.
-	self assert: fontSizeAttr size equals: (label valueOfTokenNamed: #'font-size').
+	" remember that the skin drives the look so the font size is not applied here "
+	"self deny: fontSizeAttr size equals: hugeFontSize.
+	self
+		assert: fontSizeAttr size
+		equals: (label valueOfTokenNamed: #'font-size')."
+	space applyAllSkinPhases.
 	" changing the text should renew the skin (and then take the stamp into account again)"
 	label text: 'Goodbye'.
+	space applyAllSkinPhases.
+
 	self assert: label text asString equals: 'Goodbye'.
 	prevAttributes := attributes.
+
 	attributes := label text attributesAt: 1.
 	self assert: prevAttributes ~~ attributes.
-	space applyAllSkinPhases.
 	fontSizeAttr := label text iterator
 		                detectAttribute: [ :a |
 		                a isKindOf: BlFontSizeDefaultAttribute ]
 		                ifFound: [ :a | a ]
 		                ifNone: [
 		                self fail:
 			                'should have a BlFontSizeDefaultAttribute' ].
-	self assert: fontSizeAttr size equals: (label valueOfTokenNamed: #'font-size').
-
+	self
+		assert: fontSizeAttr size
+		equals: (label valueOfTokenNamed: #'font-size')
 ]
 
 { #category : #tests }

src/Toplo-Widget-List-Tests/ToSelectionModelCommandTest.class.st

@@ -51,19 +51,6 @@ ToSelectionModelCommandTest >> applyCommand: aCommand [
 	aCommand applyWithOperator: self
 ]
 
-{ #category : #'event management' }
-ToSelectionModelCommandTest >> dispatchEvent: anEvent [
-
-	(anEvent isKindOf: ToElementCommandApplicationRequest) ifTrue: [
-		anEvent sendTo: self ]
-]
-
-{ #category : #'event management' }
-ToSelectionModelCommandTest >> elementCommandApplicationRequest: anEvent [
-
-	anEvent currentTarget applyCommand: anEvent command
-]
-
 { #category : #accessing }
 ToSelectionModelCommandTest >> noSelectionCommand [
 

src/Toplo-Widget-List/ToCommandApplicationTask.class.st

@@ -21,25 +21,23 @@ ToCommandApplicationTask >> applier: anObject [
 { #category : #'api - running' }
 ToCommandApplicationTask >> applyAll [
 
-	| nextInQueue |
-
+	element ifNil: [ ^ self ].
 	self canApplyCommands ifFalse: [
-		finishedAction value.
 		posponedRequestTask ifNotNil: [ ^ self ].
 		posponedRequestTask := BlTaskAction new.
 		posponedRequestTask action: [
-			applier dispatchEvent: ToCommandApplicationTaskActivationEvent new ].
+			"applier dispatchEvent: ToCommandApplicationTaskActivationEvent new"
+			self privateApplyAll ].
 		element enqueueTask: posponedRequestTask.
 		^ self ].
 
-	[ (nextInQueue := commandQueue nextOrNil) isNotNil ] whileTrue: [
-		applier applyCommand: nextInQueue ]
+	self privateApplyAll 
 ]
 
 { #category : #'api - running' }
 ToCommandApplicationTask >> canApplyCommands [
-
-	^ element isAttachedToSceneGraph
+	
+	^ element notNil and: [ element isAttachedToSceneGraph ]
 ]
 
 { #category : #initialization }
@@ -66,9 +64,17 @@ ToCommandApplicationTask >> operator: anOperator [
 	operator := anOperator
 ]
 
+{ #category : #'api - running' }
+ToCommandApplicationTask >> privateApplyAll [
+
+	| nextInQueue |
+	[ (nextInQueue := commandQueue nextOrNil) isNotNil ] whileTrue: [
+		applier applyCommand: nextInQueue ]
+]
+
 { #category : #'api - running' }
 ToCommandApplicationTask >> run [
 
 	self applyAll.
-	finishedAction value
+	finishedAction value.
 ]

src/Toplo-Widget-List/ToCommandApplier.class.st

@@ -8,19 +8,19 @@ Class {
 }
 
 { #category : #accessing }
-ToCommandApplier >> element: anElement [
+ToCommandApplier >> command: aCommand addedIn: aSelecter [
 
-	element := anElement
+	self subclassResponsibility 
 ]
 
-{ #category : #'event handling' }
-ToCommandApplier >> elementCommandAddedEvent: aCommandAddedEvent [
+{ #category : #accessing }
+ToCommandApplier >> element: anElement [
 
-	self subclassResponsibility 
+	element := anElement
 ]
 
 { #category : #'api - accessing' }
 ToCommandApplier >> eventsToHandle [
 
-	^ { ToElementCommandAddedEvent. }
+	^ {  }
 ]

src/Toplo-Widget-List/ToDataSourceCommandApplier.class.st

@@ -4,15 +4,14 @@ Class {
 	#category : #'Toplo-Widget-List-Command-Support'
 }
 
-{ #category : #'event handling' }
-ToDataSourceCommandApplier >> elementCommandAddedEvent: aCommandAddedEvent [
+{ #category : #accessing }
+ToDataSourceCommandApplier >> command: aCommand addedIn: aSelecter [
 
 	element isAttachedToSceneGraph ifFalse: [
-		aCommandAddedEvent currentTarget applyCommand:
-			aCommandAddedEvent command.
+		aSelecter applyCommand: aCommand.
 		^ self ].
 	element dataSource
-		notifySelecterCommandApplicationRequest: aCommandAddedEvent command
-		from: aCommandAddedEvent currentTarget.
+		notifySelecterCommandApplicationRequest: aCommand
+		from: aSelecter.
 	element spaceDo: [ :sp | sp requestNextPulse ]
 ]

src/Toplo-Widget-List/ToImmediateCommandApplier.class.st

@@ -0,0 +1,11 @@
+Class {
+	#name : #ToImmediateCommandApplier,
+	#superclass : #ToCommandApplier,
+	#category : #'Toplo-Widget-List-Command-Support'
+}
+
+{ #category : #accessing }
+ToImmediateCommandApplier >> command: aCommand addedIn: aSelecter [
+
+	aSelecter applyCommand: aCommand
+]

src/Toplo-Widget-List/ToListSelecter.class.st

@@ -21,9 +21,7 @@ Class {
 ToListSelecter >> addCommand: aCommand [
 
 	enabled ifFalse: [ ^ self ].
-	self dispatchEvent: (ToElementCommandAddedEvent new
-			 command: aCommand;
-			 yourself)
+	commandApplier command: aCommand addedIn: self
 ]
 
 { #category : #'command application' }

src/Toplo-Widget-List/ToQueueBasedCommandApplier.class.st

@@ -11,25 +11,18 @@ Class {
 }
 
 { #category : #'event handling' }
-ToQueueBasedCommandApplier >> elementCommandAddedEvent: aCommandAddedEvent [
+ToQueueBasedCommandApplier >> command: aCommand addedIn: aSelecter [
 
 	weak ifTrue: [
 		element isAttachedToSceneGraph ifFalse: [
-			aCommandAddedEvent currentTarget applyCommand:
-				aCommandAddedEvent command.
+			aSelecter applyCommand: aCommand.
 			^ self ] ].
 
-	commandQueue nextPut: aCommandAddedEvent command.
+	commandQueue nextPut: aCommand.
 	self postApplicationTask.
 	element spaceDo: [ :sp | sp requestNextPulse ]
 ]
 
-{ #category : #'event handling' }
-ToQueueBasedCommandApplier >> elementCommandApplicationRequest: anEvent [
-
-	anEvent currentTarget applyCommand: anEvent command
-]
-
 { #category : #'event handling' }
 ToQueueBasedCommandApplier >> elementCommandApplicationTaskActivationEvent: aCommandsApplicationRequestEvent [
 
@@ -40,7 +33,6 @@ ToQueueBasedCommandApplier >> elementCommandApplicationTaskActivationEvent: aCom
 ToQueueBasedCommandApplier >> eventsToHandle [
 
 	^ super eventsToHandle , {
-		  ToElementCommandApplicationRequest.
 		  ToCommandApplicationTaskActivationEvent }
 ]
 

src/Toplo-Widget-List/ToSieveSelecter.class.st

@@ -7,7 +7,7 @@ Class {
 { #category : #initialization }
 ToSieveSelecter >> initializeCommandApplier [
 
-	commandApplier := ToDirectCommandApplier new
+	commandApplier := ToImmediateCommandApplier new
 ]
 
 { #category : #'event firing' }

src/Toplo-Widget-List/ToTaskBasedCommandApplier.class.st

@@ -8,16 +8,14 @@ Class {
 }
 
 { #category : #'event handling' }
-ToTaskBasedCommandApplier >> elementCommandAddedEvent: aCommandAddedEvent [
+ToTaskBasedCommandApplier >> command: aCommand addedIn: aSelecter [
 
 	weak ifTrue: [
 		element isAttachedToSceneGraph ifFalse: [
-			aCommandAddedEvent currentTarget applyCommand:
-				aCommandAddedEvent command.
+			aSelecter applyCommand: aCommand.
 			^ self ] ].
-	element enqueueTask: (BlTaskAction new action: [
-			 aCommandAddedEvent currentTarget applyCommand:
-				 aCommandAddedEvent command ])
+	element enqueueTask:
+		(BlTaskAction new action: [ aSelecter applyCommand: aCommand ])
 ]
 
 { #category : #initialization }

src/Toplo-Widget-Select/ToMultiSelectBarElement.class.st

@@ -72,12 +72,6 @@ ToMultiSelectBarElement >> checkMaxSelectedCount [
 	self popupListElement notifyDataSourceChanged
 ]
 
-{ #category : #initialization }
-ToMultiSelectBarElement >> defaultNodeManager [
-
-	^ ToMultiSelectNodeManager new
-]
-
 { #category : #layout }
 ToMultiSelectBarElement >> extentChanged [
 
@@ -131,7 +125,7 @@ ToMultiSelectBarElement >> initialize [
 	self selectionOption masked: true.
 	self primarySelectionMode makeDisabledUnselectable: true.
 	self secondarySelectionMode selectionOption masked: true.
-
+	self nodeHolderClass: ToMultiSelectHolder.
 	maxSelectedCount := 0.
 	keepPickOrder := false.
 	pickCount := 0.

src/Toplo-Widget-Select/ToMultiSelectElement.class.st

@@ -133,8 +133,7 @@ ToMultiSelectElement >> nodeWrapping: aBoolean [
 { #category : #'accessing - list' }
 ToMultiSelectElement >> setGroupIndex: anIndex [
 
-	self popupListElement groupSelecter selectIndex: anIndex.
-	self popupListElement disabledSelecter selectIndex: anIndex
+	self popupListElement groupSelecter selectIndex: anIndex
 ]
 
 { #category : #private }

src/Toplo-Widget-Select/ToMultiSelectListElementEventHandler.class.st

@@ -0,0 +1,24 @@
+Class {
+	#name : #ToMultiSelectListElementEventHandler,
+	#superclass : #ToSelectListElementEventHandler,
+	#category : #'Toplo-Widget-Select-List'
+}
+
+{ #category : #'api - accessing' }
+ToMultiSelectListElementEventHandler >> eventsToHandle [ 
+
+	^ super eventsToHandle , { ToSelectGroupSelectionChangedEvent }
+]
+
+{ #category : #'event handling' }
+ToMultiSelectListElementEventHandler >> selectGroupSelectionChangedEvent: anEvent [
+
+	| touchedIntervals target |
+	touchedIntervals := anEvent touchedIntervals.
+	target := anEvent currentTarget.
+	touchedIntervals do: [ :int |
+		target disabledSelecter selectIndex: int first to: int last.
+		self flag: 'Given that the list is initialized with #makeDisabledUnselectable: true, having to unselect here is not desired. It is necessary here because instead, the secondary selection can be on a group index.'.
+		target unselectableSelecter selectIndex: int first to: int last.
+		target dataSource notifyItemsChanged: int ]
+]