diff --git a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st index 2ff6c65a..9dfd0f99 100644 --- a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st +++ b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st @@ -211,7 +211,7 @@ SpChooserPresenter >> initializePresenters [ SpChooserPresenter >> initializeSortingBlocks [ | sortingBlock | - sortingBlock := sourceList displayBlock ascending. + sortingBlock := sourceList display ascending. sourceList sortingBlock: sortingBlock. targetList sortingBlock: sortingBlock ] diff --git a/src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st b/src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st index 890b8b99..85bbf06c 100644 --- a/src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st +++ b/src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st @@ -79,9 +79,8 @@ SpFilteringListPresenter >> defaultOutputPort [ { #category : 'api' } SpFilteringListPresenter >> display [ - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. - - ^ self listPresenter displayBlock + + ^ self listPresenter display ] { #category : 'api' } @@ -90,12 +89,6 @@ SpFilteringListPresenter >> display: aBlock [ self listPresenter display: aBlock ] -{ #category : 'api' } -SpFilteringListPresenter >> displayBlock [ - - ^ self listPresenter displayBlock -] - { #category : 'api' } SpFilteringListPresenter >> displayIcon: aBlock [ @@ -118,7 +111,7 @@ SpFilteringListPresenter >> filterListItems: pattern [ filteredItems := unfilteredItems select: [ :item | itemFilterBlock - value: (self displayBlock value: item) + value: (self display value: item) value: pattern ]. listPresenter items: filteredItems diff --git a/src/Spec2-CommonWidgets/SpFilteringSelectableListPresenter.class.st b/src/Spec2-CommonWidgets/SpFilteringSelectableListPresenter.class.st index 04365aae..8e1861d6 100644 --- a/src/Spec2-CommonWidgets/SpFilteringSelectableListPresenter.class.st +++ b/src/Spec2-CommonWidgets/SpFilteringSelectableListPresenter.class.st @@ -49,7 +49,7 @@ SpFilteringSelectableListPresenter >> deactivateItem: anObject [ { #category : 'api' } SpFilteringSelectableListPresenter >> display [ - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock' . + ^ displayBlock ] @@ -60,12 +60,6 @@ SpFilteringSelectableListPresenter >> display: aBlock [ listPresenter columns: self listColumns ] -{ #category : 'api' } -SpFilteringSelectableListPresenter >> displayBlock [ - - ^ displayBlock -] - { #category : 'api' } SpFilteringSelectableListPresenter >> displayIcon: aBlock [ diff --git a/src/Spec2-Core/SpDropListPresenter.class.st b/src/Spec2-Core/SpDropListPresenter.class.st index 0e08ecd1..a9f83350 100644 --- a/src/Spec2-Core/SpDropListPresenter.class.st +++ b/src/Spec2-Core/SpDropListPresenter.class.st @@ -83,7 +83,7 @@ SpDropListPresenter >> disableSelectionDuring: aBlock [ SpDropListPresenter >> display [ "Answer the formatting block to transform how the elements will be displayed. See also `SpDropListPresenter>>#display:`" - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. + ^ displayBlock ] @@ -97,19 +97,11 @@ SpDropListPresenter >> display: aBlock [ ] -{ #category : 'api' } -SpDropListPresenter >> displayBlock [ - "Answer the formatting block to transform how the elements will be displayed. - See also `SpDropListPresenter>>#display:`" - - ^ displayBlock -] - { #category : 'private' } SpDropListPresenter >> displayForItem: anItem [ "The order of the arguments may look weird, but then it seems more natural while using the widget" - ^ self displayBlock cull: anItem model cull: anItem + ^ self display cull: anItem model cull: anItem ] { #category : 'api' } diff --git a/src/Spec2-Core/SpDropListTableColumn.class.st b/src/Spec2-Core/SpDropListTableColumn.class.st index 8bfbc096..ca734de3 100644 --- a/src/Spec2-Core/SpDropListTableColumn.class.st +++ b/src/Spec2-Core/SpDropListTableColumn.class.st @@ -43,7 +43,7 @@ SpDropListTableColumn >> acceptColumnVisitor: aBuilder [ { #category : 'accessing' } SpDropListTableColumn >> display [ - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. + ^ display ] @@ -53,12 +53,6 @@ SpDropListTableColumn >> display: aBlock [ display := aBlock ] -{ #category : 'accessing' } -SpDropListTableColumn >> displayBlock [ - - ^ display -] - { #category : 'initialization' } SpDropListTableColumn >> initialize [ diff --git a/src/Spec2-Core/SpListPresenter.class.st b/src/Spec2-Core/SpListPresenter.class.st index afbd9071..208d5add 100644 --- a/src/Spec2-Core/SpListPresenter.class.st +++ b/src/Spec2-Core/SpListPresenter.class.st @@ -51,11 +51,10 @@ SpListPresenter >> clickOnSelectedItem [ { #category : 'api' } SpListPresenter >> display [ - "Answer the display block that will transform the objects from `SpAbstractListPresenter>>#model` into a displayable string." - - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. - ^ self displayBlock. - + "Answer the display block that will transform the objects from `SpAbstractListPresenter>>#model` into a + displayable string." + + ^ display ] { #category : 'api' } @@ -75,13 +74,6 @@ SpListPresenter >> display: aBlock [ display := aBlock ] -{ #category : 'api' } -SpListPresenter >> displayBlock [ - "Answer the display block that will transform the objects from `SpAbstractListPresenter>>#model` into a displayable string." - - ^ display -] - { #category : 'api' } SpListPresenter >> displayIcon [ "Return the block used to return an icon that will be displayed in the list" diff --git a/src/Spec2-Core/SpTreePresenter.class.st b/src/Spec2-Core/SpTreePresenter.class.st index e2799316..cd03a6e9 100644 --- a/src/Spec2-Core/SpTreePresenter.class.st +++ b/src/Spec2-Core/SpTreePresenter.class.st @@ -67,7 +67,7 @@ SpTreePresenter >> beResizable [ { #category : 'api' } SpTreePresenter >> display [ "Answer the display block that will transform the model nodes into a displayable string." - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. + ^ displayBlock ] @@ -88,13 +88,6 @@ SpTreePresenter >> display: aBlock [ displayBlock := aBlock ] -{ #category : 'api' } -SpTreePresenter >> displayBlock [ - "Answer the display block that will transform the model nodes into a displayable string." - - ^ displayBlock -] - { #category : 'api' } SpTreePresenter >> displayIcon [ "Return the block used to return an icon that will be displayed in the tree" diff --git a/src/Spec2-Morphic/SpDatePresenter.class.st b/src/Spec2-Morphic/SpDatePresenter.class.st index cfd3e4f6..d753b8fc 100644 --- a/src/Spec2-Morphic/SpDatePresenter.class.st +++ b/src/Spec2-Morphic/SpDatePresenter.class.st @@ -65,7 +65,7 @@ SpDatePresenter >> date: aDate [ | dateString | date := aDate. - dateString := self displayBlock value: date. + dateString := self display value: date. self dateModel text: dateString. ] @@ -84,7 +84,7 @@ SpDatePresenter >> defaultDate [ SpDatePresenter >> display [ "Return the one argument block used to wrap your domain specific items. The block should return something that can be displayed in a list - like a String or a Text" - self deprecated: 'Please use displayBlock' transformWith: '`aRec display' -> '`aRec displayBlock'. + ^ displayBlock ] @@ -95,14 +95,6 @@ SpDatePresenter >> display: aBlock [ displayBlock := aBlock ] -{ #category : 'api' } -SpDatePresenter >> displayBlock [ - "Return the one argument block used to wrap your domain specific items. - The block should return something that can be displayed in a list - like a String or a Text" - - ^ displayBlock -] - { #category : 'private' } SpDatePresenter >> iconMorph [