From 866edc6b07bb302d154a22733008f260c15d81de Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 17 May 2024 16:16:27 +0200 Subject: [PATCH 1/3] Remove references to deprecated classes They will be removed of P13 --- src/Spec2-Examples/SpTransmissionExample.class.st | 2 +- src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spec2-Examples/SpTransmissionExample.class.st b/src/Spec2-Examples/SpTransmissionExample.class.st index 92ce2797..9ed8aed8 100644 --- a/src/Spec2-Examples/SpTransmissionExample.class.st +++ b/src/Spec2-Examples/SpTransmissionExample.class.st @@ -173,7 +173,7 @@ SpTransmissionExample >> initializePackagesPresenter [ display: [ :package | package name ]; displayIcon: [ self iconNamed: #package ]; sortingBlock: [ :a :b | a name < b name ]; - items: RPackageOrganizer default packages + items: self class packageOrganizer packages ] { #category : 'initialization' } diff --git a/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st b/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st index b19ae9a1..cd7b6736 100644 --- a/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st +++ b/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st @@ -32,7 +32,7 @@ SpPresenterBuildTest >> testBuildPresenterWillSetPresenterProperty [ SpPresenterBuildTest >> testBuildWidgetPresenterWillSetPresenterProperty [ | package | - package := RPackageOrganizer default packageNamed: 'Spec2-Core'. + package := self class packageOrganizer packageNamed: 'Spec2-Core'. SpAbstractWidgetPresenter allSubclasses select: [ :each | each package = package and: [ From 6fd82215767171a7fdd12ba0c7c80f4ebf6fa0a6 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 17 May 2024 16:25:36 +0200 Subject: [PATCH 2/3] Fix more deprecations --- src/Spec2-CommonWidgets/SpChooserPresenter.class.st | 7 ++----- .../SpTransmissionComponentListExample.class.st | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st index b9a5e8f9..abb40fc6 100644 --- a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st +++ b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st @@ -48,11 +48,8 @@ SpChooserPresenter class >> exampleClasses [ { #category : 'examples' } SpChooserPresenter class >> examplePackages [ - ^ (self - sourceItems: RPackageOrganizer default packages - chosenItems: - { (RPackageOrganizer default packageNamed: 'Spec2-CommonWidgets') } - displayBlock: #packageName) open + ^ (self sourceItems: self packageOrganizer packages chosenItems: { (self packageOrganizer packageNamed: 'Spec2-CommonWidgets') } displayBlock: #packageName) + open ] { #category : 'instance creation' } diff --git a/src/Spec2-Examples/SpTransmissionComponentListExample.class.st b/src/Spec2-Examples/SpTransmissionComponentListExample.class.st index 30901d5e..7e855cd3 100644 --- a/src/Spec2-Examples/SpTransmissionComponentListExample.class.st +++ b/src/Spec2-Examples/SpTransmissionComponentListExample.class.st @@ -96,9 +96,9 @@ SpTransmissionComponentListExample >> initializePresenters [ display: [ :package | package name ]; displayIcon: [ self iconNamed: #package ]; sortingBlock: [ :a :b | a name < b name ]; - items: RPackageOrganizer default packages. + items: self class packageOrganizer packages. - classesPresenter := self newComponentList. + classesPresenter := self newComponentList ] { #category : 'initialization' } From 6a531cbb857c4dbcbaae86b6078d3e90f011672b Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 17 May 2024 16:32:55 +0200 Subject: [PATCH 3/3] Formating --- src/Spec2-CommonWidgets/SpChooserPresenter.class.st | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st index abb40fc6..6782b4e5 100644 --- a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st +++ b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st @@ -48,7 +48,10 @@ SpChooserPresenter class >> exampleClasses [ { #category : 'examples' } SpChooserPresenter class >> examplePackages [ - ^ (self sourceItems: self packageOrganizer packages chosenItems: { (self packageOrganizer packageNamed: 'Spec2-CommonWidgets') } displayBlock: #packageName) + ^ (self + sourceItems: self packageOrganizer packages + chosenItems: { (self packageOrganizer packageNamed: 'Spec2-CommonWidgets') } + displayBlock: #packageName) open ]