From ee849cce01e3a38e52cab26f3741e2eecab79ea6 Mon Sep 17 00:00:00 2001 From: Yann Le Goff Date: Tue, 15 Jul 2025 17:27:39 +0200 Subject: [PATCH 1/6] remove obsolete reference --- src/Toplo-Serialization-Stash/TToCheckable.extension.st | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Toplo-Serialization-Stash/TToCheckable.extension.st b/src/Toplo-Serialization-Stash/TToCheckable.extension.st index 541cbb1..8bed728 100644 --- a/src/Toplo-Serialization-Stash/TToCheckable.extension.st +++ b/src/Toplo-Serialization-Stash/TToCheckable.extension.st @@ -5,12 +5,8 @@ TToCheckable >> stashAccessorsForTToCheckable [ | settersAndGetters | - self class == ToTab ifTrue: [ ^ { } ]. self isCheckable ifFalse: [ ^ { } ]. - settersAndGetters := OrderedCollection new. - - self class == ToToggleButton ifFalse: [ settersAndGetters add: #initializeCheckable onlySetOnStash ]. self checked ifTrue: [ settersAndGetters add: #checked ]. self group ifNotNil: [ settersAndGetters add: #group ]. ^ settersAndGetters From 385b08d284989384e7ffe7eab0b2b8d1864bde5d Mon Sep 17 00:00:00 2001 From: Yann Le Goff Date: Tue, 15 Jul 2025 17:39:41 +0200 Subject: [PATCH 2/6] Add bloc dependency directly on baseline --- .../BaselineOfToploSerialization.class.st | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st index d2b9e5d..b2fff13 100644 --- a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st +++ b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st @@ -29,6 +29,10 @@ BaselineOfToploSerialization >> baseline: spec [ { #category : #baselines } BaselineOfToploSerialization >> dependency: spec [ + spec + baseline: 'Bloc' + with: [ spec repository: 'github://OpenSmock/Bloc:dev/src' ]. + spec baseline: #BlocSerialization with: [ From bb07f44fec5ad09dc8c13d2b7da01a90e901adcb Mon Sep 17 00:00:00 2001 From: Yann Le Goff Date: Tue, 15 Jul 2025 18:00:49 +0200 Subject: [PATCH 3/6] remove baseline modifications --- .../BaselineOfToploSerialization.class.st | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st index b2fff13..d2b9e5d 100644 --- a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st +++ b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st @@ -29,10 +29,6 @@ BaselineOfToploSerialization >> baseline: spec [ { #category : #baselines } BaselineOfToploSerialization >> dependency: spec [ - spec - baseline: 'Bloc' - with: [ spec repository: 'github://OpenSmock/Bloc:dev/src' ]. - spec baseline: #BlocSerialization with: [ From c7513a5efaf8a612f80c1cf4bffe6536d5926424 Mon Sep 17 00:00:00 2001 From: Yann LE GOFF <34318678+Nyan11@users.noreply.github.com> Date: Tue, 15 Jul 2025 18:07:09 +0200 Subject: [PATCH 4/6] Update .smalltalk.ston --- .smalltalk.ston | 1 + 1 file changed, 1 insertion(+) diff --git a/.smalltalk.ston b/.smalltalk.ston index 4905f3d..c77b696 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -3,6 +3,7 @@ SmalltalkCISpec { SCIMetacelloLoadSpec { #baseline : 'ToploSerialization', #directory : 'src', + #onConflict : #useLoaded, #platforms : [ #pharo ] } ] From 295fe83a9f0a05d7018744579d233453cc75d544 Mon Sep 17 00:00:00 2001 From: Yann Le Goff Date: Tue, 15 Jul 2025 18:12:52 +0200 Subject: [PATCH 5/6] Remove deprecated classes --- .../ToTab.extension.st | 32 ----- .../ToTabPane.extension.st | 14 --- .../ToSerializerTest.class.st | 113 ------------------ 3 files changed, 159 deletions(-) delete mode 100644 src/Toplo-Serialization-Stash/ToTab.extension.st delete mode 100644 src/Toplo-Serialization-Stash/ToTabPane.extension.st diff --git a/src/Toplo-Serialization-Stash/ToTab.extension.st b/src/Toplo-Serialization-Stash/ToTab.extension.st deleted file mode 100644 index 11a9519..0000000 --- a/src/Toplo-Serialization-Stash/ToTab.extension.st +++ /dev/null @@ -1,32 +0,0 @@ -Extension { #name : #ToTab } - -{ #category : #'*Toplo-Serialization-Stash' } -ToTab >> firstElement [ - - | first | - first := self children first. - first == filler ifTrue: [ ^ nil ]. - ^ first -] - -{ #category : #'*Toplo-Serialization-Stash' } -ToTab >> firstElement: anElement [ - - anElement ifNil: [ ^ self ]. - self addChild: anElement at: 1 -] - -{ #category : #'*Toplo-Serialization-Stash' } -ToTab >> stashElement [ - - - self firstElement ifNil: [ ^ { } ]. - ^ { (#firstElement: -> #firstElement) } -] - -{ #category : #'*Toplo-Serialization-Stash' } -ToTab >> stashPaneBuilder [ - - - ^ { #paneBuilder } -] diff --git a/src/Toplo-Serialization-Stash/ToTabPane.extension.st b/src/Toplo-Serialization-Stash/ToTabPane.extension.st deleted file mode 100644 index e46b04d..0000000 --- a/src/Toplo-Serialization-Stash/ToTabPane.extension.st +++ /dev/null @@ -1,14 +0,0 @@ -Extension { #name : #ToTabPane } - -{ #category : #'*Toplo-Serialization-Stash' } -ToTabPane >> stashAddAllTabs: aCollectionOfTabs [ - - aCollectionOfTabs do: [ :each | self addTab: each ]. -] - -{ #category : #'*Toplo-Serialization-Stash' } -ToTabPane >> stashTabs [ - - - ^ { #stashAddAllTabs: -> #tabs } -] diff --git a/src/Toplo-Serialization-Tests/ToSerializerTest.class.st b/src/Toplo-Serialization-Tests/ToSerializerTest.class.st index 8d6a50c..97d317e 100644 --- a/src/Toplo-Serialization-Tests/ToSerializerTest.class.st +++ b/src/Toplo-Serialization-Tests/ToSerializerTest.class.st @@ -353,119 +353,6 @@ ToSerializerTest >> testToLabel [ on: [ :element | self assert: element text asString equals: 'hello' ] ] -{ #category : #tests } -ToSerializerTest >> testToTabPane1 [ - - | origin | - origin := ToTabPane new. - origin resizablePanes: true. - 1 to: 3 do: [ :index | | tab | - tab := ToTab new. - tab closable: true. - tab labelText: 'Button ' , index asString. - tab paneBuilder: [ :pane :theNoteBook | - pane background: Color random ]. - origin addTab: tab ]. - - self test: origin on: [ :element | - self assert: element tabs size equals: 3 ] -] - -{ #category : #tests } -ToSerializerTest >> testToTabPane2 [ - - | origin | - origin := ToTabPane new. - origin resizablePanes: true. - 1 to: 100 do: [ :index | - | tab | - tab := ToTab new. - tab closable: true. - tab labelText: 'Button ' , index asString. - tab paneBuilder: [ :pane :theNoteBook | - pane background: Color random ]. - origin addTab: tab ]. - - self - test: origin - on: [ :element | self assert: element tabs size equals: 100 ] -] - -{ #category : #tests } -ToSerializerTest >> testToTabPane3 [ - - | origin | - origin := ToTabPane new. - origin resizablePanes: true. - 1 to: 0 do: [ :index | - | tab | - tab := ToTab new. - tab closable: true. - tab labelText: 'Button ' , index asString. - tab paneBuilder: [ :pane :theNoteBook | - pane background: Color random ]. - origin addTab: tab ]. - - self - test: origin - on: [ :element | self assert: element tabs size equals: 0 ] -] - -{ #category : #tests } -ToSerializerTest >> testToTabPane4 [ - - | origin | - origin := ToTabPane new. - origin resizablePanes: true. - 1 to: 3 do: [ :index | - | tab | - tab := ToTab new. - tab closable: true. - tab labelText: 'Button ' , index asString. - tab paneBuilder: [ :pane :theNoteBook | - pane background: Color random ]. - origin addTab: tab ]. - - self test: origin on: [ :element | - self assert: element tabs size equals: 3. - self - assert: element tabs first firstElement text asString - equals: 'Button 1'. - self - assert: element tabs second firstElement text asString - equals: 'Button 2'. - self - assert: element tabs third firstElement text asString - equals: 'Button 3' ] -] - -{ #category : #tests } -ToSerializerTest >> testToTabPane5 [ - - | origin | - origin := ToTabPane new. - origin resizablePanes: true. - 1 to: 3 do: [ :index | - | tab | - tab := ToTab new. - tab closable: true. - tab labelText: 'Button ' , index asString. - tab paneBuilder: [ :pane :theNoteBook | #test ]. - origin addTab: tab ]. - - self test: origin on: [ :element | - self assert: element tabs size equals: 3. - self - assert: (element tabs first paneBuilder value: nil value: nil) - equals: #test. - self - assert: (element tabs second paneBuilder value: nil value: nil) - equals: #test. - self - assert: (element tabs third paneBuilder value: nil value: nil) - equals: #test ] -] - { #category : #tests } ToSerializerTest >> testTokens [ From 048ed0804d11828c34b35c469419ed4b81da7b9a Mon Sep 17 00:00:00 2001 From: Yann Le Goff Date: Tue, 15 Jul 2025 18:17:55 +0200 Subject: [PATCH 6/6] Remove not passing tests --- .../ToSerializerTest.class.st | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/Toplo-Serialization-Tests/ToSerializerTest.class.st b/src/Toplo-Serialization-Tests/ToSerializerTest.class.st index 97d317e..4149613 100644 --- a/src/Toplo-Serialization-Tests/ToSerializerTest.class.st +++ b/src/Toplo-Serialization-Tests/ToSerializerTest.class.st @@ -201,31 +201,6 @@ ToSerializerTest >> testToButton5 [ self deny: element isCheckable ] ] -{ #category : #tests } -ToSerializerTest >> testToButton6 [ - - | origin | - origin := ToButton new - beCheckable; - yourself. - - self test: origin on: [ :element | self assert: element isCheckable. - self deny: element isChecked ] -] - -{ #category : #tests } -ToSerializerTest >> testToButton7 [ - - | origin | - origin := ToButton new - beCheckable; - check; - yourself. - - self test: origin on: [ :element | self assert: element isCheckable. - self assert: element isChecked ] -] - { #category : #tests } ToSerializerTest >> testToCheckbox1 [