ready to separate additionnal selecters

src/Toplo-Examples/ToSandBox.class.st

@@ -1443,6 +1443,7 @@ ToSandBox class >> example_SelectMultiFiltrableWithHideSelected [
 
 	| select innerWindow |
 	select := ToSelectElement new.
+	select inspect.
 	select hideSelected: true.
 	select dataAccessor updateAllWith: self statesOfAmerica.
 	select strategy: ToMultipleSelectStrategy new.

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

@@ -1,10 +1,6 @@
 Class {
 	#name : #ToAbstractSelectionModelSelecter,
 	#superclass : #Object,
-	#instVars : [
-		'operator',
-		'selectionModel'
-	],
 	#category : #'Toplo-Widget-List-Selection-Selecter'
 }
 
@@ -14,12 +10,6 @@ ToAbstractSelectionModelSelecter >> copySelectionFrom: aSourceSelectionModel [
 	self subclassResponsibility 
 ]
 
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> currentIndex [ 
-
-	^ self subclassResponsibility 
-]
-
 { #category : #operations }
 ToAbstractSelectionModelSelecter >> deselectAll [
 
@@ -56,24 +46,6 @@ ToAbstractSelectionModelSelecter >> nextSelectableIndex [
 	^ self subclassResponsibility 
 ]
 
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> operateSilently [
-
-	^ false
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> operator [
-
-	^ operator
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> operator: anOperator [
-
-	operator := anOperator
-]
-
 { #category : #private }
 ToAbstractSelectionModelSelecter >> previousDeselectedIndex [
 
@@ -127,15 +99,3 @@ ToAbstractSelectionModelSelecter >> selectOnlyIndexes: anArray [
 
 	self subclassResponsibility 
 ]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> selectedIndexes [
-
-	^ self subclassResponsibility 
-]
-
-{ #category : #accessing }
-ToAbstractSelectionModelSelecter >> selectionModel: aSelectionModel [
-
-	selectionModel := aSelectionModel
-]

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

@@ -0,0 +1,21 @@
+Class {
+	#name : #ToAdditionalSelectionModel,
+	#superclass : #ToSelectionModel,
+	#instVars : [
+		'uniqueId'
+	],
+	#category : #'Toplo-Widget-List-Selection-Model'
+}
+
+{ #category : #accessing }
+ToAdditionalSelectionModel >> uniqueId [
+
+	uniqueId ifNil: [ Error signal: 'A uniqueId should not be nil' ].
+	^ uniqueId
+]
+
+{ #category : #accessing }
+ToAdditionalSelectionModel >> uniqueId: anObject [
+
+	uniqueId := anObject
+]

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

@@ -22,7 +22,7 @@ ToAdditionalSelectionModelSelecter >> eventClass [
 ToAdditionalSelectionModelSelecter >> onInstalledIn: aListElement [
 
 	operator := ToAdditionalSelectionModelOperator on: aListElement withEventClass: self eventClass.
-	selectionModel := aListElement newSelectionModel.
+	selectionModel := aListElement newAdditionalSelectionModel.
 	selectionModel onInstalledIn: aListElement.
 	self beMultipleSelection.
 

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

@@ -83,6 +83,14 @@ ToBasicListElement >> initialize [
 	nodeReleaser := self defaultNodeReleaser 
 ]
 
+{ #category : #'instance creation' }
+ToBasicListElement >> newAdditionalSelectionModel [
+
+	^ ToAdditionalSelectionModel new
+		  itemCountGetter: [ self dataSource itemCount ];
+		  yourself
+]
+
 { #category : #'instance creation' }
 ToBasicListElement >> newPrimarySelectionModel [
 

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

@@ -1,6 +1,6 @@
 Class {
 	#name : #ToDisabledSelectionModelSelecter,
-	#superclass : #ToAdditionalSelectionModelSelecter,
+	#superclass : #ToPredefinedAdditionalSelectionModelSelecter,
 	#category : #'Toplo-Widget-List-Selection-Selecter'
 }
 

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

@@ -2,6 +2,8 @@ Class {
 	#name : #ToEffectiveSelectionModelSelecter,
 	#superclass : #ToAbstractSelectionModelSelecter,
 	#instVars : [
+		'operator',
+		'selectionModel',
 		'multiple'
 	],
 	#category : #'Toplo-Widget-List-Selection-Selecter'
@@ -160,6 +162,18 @@ ToEffectiveSelectionModelSelecter >> nextSelectableIndexToScrollTo [
 				  ifFalse: [ 0 ] ]
 ]
 
+{ #category : #accessing }
+ToEffectiveSelectionModelSelecter >> operator [
+
+	^ operator
+]
+
+{ #category : #accessing }
+ToEffectiveSelectionModelSelecter >> operator: aSelectionModelOperator [
+
+	operator := aSelectionModelOperator
+]
+
 { #category : #private }
 ToEffectiveSelectionModelSelecter >> previousDeselectedIndex [
 
@@ -296,6 +310,18 @@ ToEffectiveSelectionModelSelecter >> selectedIndexes [
 	^ selectionModel selectedIndexes
 ]
 
+{ #category : #accessing }
+ToEffectiveSelectionModelSelecter >> selectionModel [
+
+	^ selectionModel
+]
+
+{ #category : #accessing }
+ToEffectiveSelectionModelSelecter >> selectionModel: aSelectionModel [
+
+	selectionModel := aSelectionModel
+]
+
 { #category : #operations }
 ToEffectiveSelectionModelSelecter >> shiftSelection: anInteger from: anIndex [
 

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

@@ -1,6 +1,6 @@
 Class {
 	#name : #ToHiddenSelectionModelSelecter,
-	#superclass : #ToAdditionalSelectionModelSelecter,
+	#superclass : #ToPredefinedAdditionalSelectionModelSelecter,
 	#category : #'Toplo-Widget-List-Selection-Selecter'
 }
 

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

@@ -80,10 +80,7 @@ ToListElement >> initialize [
 
 	super initialize.
 	self secondarySelectionMode: self defaultSecondarySelectionMode.
-	self addEventHandler: self defaultSecondarySelectionEventHandler.
-	unselectableSelecter := ToUnselectableSelectionModelSelecter on: self.
-	disabledSelecter := ToDisabledSelectionModelSelecter on: self.
-	hiddenSelecter := ToHiddenSelectionModelSelecter on: self
+	self addEventHandler: self defaultSecondarySelectionEventHandler
 ]
 
 { #category : #'instance creation' }
@@ -140,6 +137,18 @@ ToListElement >> secondarySelectionModel [
 	^ self secondarySelectionMode selectionModel
 ]
 
+{ #category : #accessing }
+ToListElement >> selectionMode: aSelectionMode [
+
+	super selectionMode: aSelectionMode.
+	unselectableSelecter ifNotNil: [ unselectableSelecter onUninstalledIn: self ].
+	disabledSelecter ifNotNil: [ disabledSelecter onUninstalledIn: self ].
+	hiddenSelecter ifNotNil: [ hiddenSelecter onUninstalledIn: self ].
+	unselectableSelecter := ToUnselectableSelectionModelSelecter on: self.
+	disabledSelecter := ToDisabledSelectionModelSelecter on: self.
+	hiddenSelecter := ToHiddenSelectionModelSelecter on: self
+]
+
 { #category : #accessing }
 ToListElement >> unselectableSelecter [
 

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

@@ -5,22 +5,34 @@ Class {
 }
 
 { #category : #accessing }
-ToListElementSelectionModel >> additionalSelectionModels [
+ToListElementSelectionModel >> additionalDependentSelectionModels [
 
 	^ self subclassResponsibility 
 ]
 
+{ #category : #accessing }
+ToListElementSelectionModel >> allDependentSelectionModels [
+
+	^ Array streamContents: [ :stream |
+		  stream nextPutAll: self standardDependentSelectionModels.
+		  stream nextPutAll: self additionalDependentSelectionModels ]
+]
+
 { #category : #copying }
 ToListElementSelectionModel >> copySelectionFrom: anotherSelectionModel [
 
 	super copySelectionFrom: anotherSelectionModel.
-	self unselectableSelectionModelDo: [ :sm |
+	self allDependentSelectionModels do: [ :sm |
 		sm copySelectionFrom:
-			anotherSelectionModel unselectableSelectionModel ].
-	self disabledSelectionModelDo: [ :sm |
-		sm copySelectionFrom: anotherSelectionModel disabledSelectionModel ].
-	self hiddenSelectionModelDo: [ :sm |
-		sm copySelectionFrom: anotherSelectionModel hiddenSelectionModel ]
+			(anotherSelectionModel dependentSelectionModelWithId: sm uniqueId) ]
+]
+
+{ #category : #accessing }
+ToListElementSelectionModel >> dependentSelectionModelWithId: anUniqueId [
+
+	^ self allDependentSelectionModels
+		  detect: [ :sm | sm uniqueId = anUniqueId ]
+		  ifNone: [  ]
 ]
 
 { #category : #updating }
@@ -126,14 +138,6 @@ ToListElementSelectionModel >> nextSelectableIndexStartingAt: anIndex [
 	^ 0
 ]
 
-{ #category : #accessing }
-ToListElementSelectionModel >> otherSelectionModels [
-
-	^ Array streamContents: [ :stream |
-		  stream nextPutAll: self standardAdditionalSelectionModels.
-		  stream nextPutAll: self additionalSelectionModels ]
-]
-
 { #category : #accessing }
 ToListElementSelectionModel >> previousSelectableIndexStartingAt: anIndex [
 
@@ -187,15 +191,15 @@ ToListElementSelectionModel >> shift: aGap from: aStartIndex for: anEventTarget
 		| count |
 		count := aGap abs.
 		self deselectIndex: aStartIndex to: aStartIndex + count - 1 ].
-	self otherSelectionModels do: [ :sm |
+	self allDependentSelectionModels do: [ :sm |
 		sm shift: aGap from: aStartIndex ].
 
 	" ** super send after **"
 	super shift: aGap from: aStartIndex for: anEventTarget
 ]
 
 { #category : #accessing }
-ToListElementSelectionModel >> standardAdditionalSelectionModels [
+ToListElementSelectionModel >> standardDependentSelectionModels [
 
 	^ {
 		  self disabledSelectionModel.
@@ -206,16 +210,15 @@ ToListElementSelectionModel >> standardAdditionalSelectionModels [
 { #category : #updating }
 ToListElementSelectionModel >> transferIndex: anIndex from: anotherPrimarySelectionModel as: targetIndex [
 
-	super transferIndex: anIndex from: anotherPrimarySelectionModel as: targetIndex.
-	anotherPrimarySelectionModel disabledSelectionModelDo: [ :sm | (sm containsIndex: anIndex)
-		ifTrue: [ self disabledSelectionModelDo: [ :osm | osm selectIndex: targetIndex ] ]
-		ifFalse: [ self disabledSelectionModelDo: [ :osm | osm  deselectIndex: targetIndex ] ] ].
-	anotherPrimarySelectionModel unselectableSelectionModelDo: [ :sm | (sm containsIndex: anIndex)
-		ifTrue: [ self unselectableSelectionModelDo: [ :osm | osm selectIndex: targetIndex ] ]
-		ifFalse: [ self unselectableSelectionModelDo: [ :osm | osm  deselectIndex: targetIndex ] ] ].
-	anotherPrimarySelectionModel hiddenSelectionModelDo: [ :sm | (sm containsIndex: anIndex)
-		ifTrue: [ self hiddenSelectionModelDo: [ :osm | osm selectIndex: targetIndex ] ]
-		ifFalse: [ self hiddenSelectionModelDo: [ :osm | osm  deselectIndex: targetIndex ] ] ]
+	super
+		transferIndex: anIndex
+		from: anotherPrimarySelectionModel
+		as: targetIndex.
+	self allDependentSelectionModels do: [ :sm |
+		(anotherPrimarySelectionModel dependentSelectionModelWithId: sm uniqueId) ifNotNil: [ :otherSm |
+			(otherSm containsIndex: anIndex)
+				ifTrue: [ sm selectIndex: targetIndex ]
+				ifFalse: [ sm deselectIndex: targetIndex ] ] ]
 ]
 
 { #category : #updating }

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

@@ -2,18 +2,18 @@ Class {
 	#name : #ToListPrimarySelectionModel,
 	#superclass : #ToListElementSelectionModel,
 	#instVars : [
-		'additionalSelectionModels',
 		'disabledSelectionModel',
 		'hiddenSelectionModel',
-		'unselectableSelectionModel'
+		'unselectableSelectionModel',
+		'additionalDependentSelectionModels'
 	],
 	#category : #'Toplo-Widget-List-Selection-Model'
 }
 
 { #category : #accessing }
-ToListPrimarySelectionModel >> additionalSelectionModels [
+ToListPrimarySelectionModel >> additionalDependentSelectionModels [
 
-	^ additionalSelectionModels
+	^ additionalDependentSelectionModels
 ]
 
 { #category : #accessing }
@@ -25,7 +25,9 @@ ToListPrimarySelectionModel >> disabledSelectionModel [
 { #category : #accessing }
 ToListPrimarySelectionModel >> disabledSelectionModel: aSelectionModel [
 
-	disabledSelectionModel := aSelectionModel
+	disabledSelectionModel := aSelectionModel.
+	disabledSelectionModel ifNil: [ ^ self ].
+	aSelectionModel uniqueId: #disabled
 ]
 
 { #category : #accessing }
@@ -37,14 +39,16 @@ ToListPrimarySelectionModel >> hiddenSelectionModel [
 { #category : #accessing }
 ToListPrimarySelectionModel >> hiddenSelectionModel: aSelectionModel [
 
-	hiddenSelectionModel := aSelectionModel
+	hiddenSelectionModel := aSelectionModel.
+	hiddenSelectionModel ifNil: [ ^ self ].
+	aSelectionModel uniqueId: #hidden
 ]
 
 { #category : #initialization }
 ToListPrimarySelectionModel >> initialize [
 
 	super initialize.
-	additionalSelectionModels := #(  )
+	additionalDependentSelectionModels := #(  )
 ]
 
 { #category : #'api - hooks' }
@@ -54,7 +58,13 @@ ToListPrimarySelectionModel >> onUninstalledIn: aListElement [
 	disabledSelectionModel := nil.
 	hiddenSelectionModel := nil.
 	unselectableSelectionModel := nil.
-	additionalSelectionModels := nil
+	additionalDependentSelectionModels := nil
+]
+
+{ #category : #accessing }
+ToListPrimarySelectionModel >> uniqueId [
+
+	^ #primary
 ]
 
 { #category : #accessing }
@@ -66,5 +76,7 @@ ToListPrimarySelectionModel >> unselectableSelectionModel [
 { #category : #accessing }
 ToListPrimarySelectionModel >> unselectableSelectionModel: aSelectionModel [
 
-	unselectableSelectionModel := aSelectionModel
+	unselectableSelectionModel := aSelectionModel.
+	aSelectionModel ifNil: [ ^ self ].
+	aSelectionModel uniqueId: #unselectable
 ]