Merge pull request #4 from OpenSmock/project-setup

Project setup

.smalltalk.ston

@@ -5,8 +5,5 @@ SmalltalkCISpec {
       #directory : 'src',
       #platforms : [ #pharo ]
     }
-  ],
-  #testing : {
-    #packages : [ 'Toplo-Serialization.*' ]
-  }
+  ]
 }

src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st

@@ -12,24 +12,29 @@ BaselineOfToploSerialization >> baseline: spec [
 		self dependency: spec.
 
 		"project packages"
+		self dependency: spec.
+
+		"project packages"
+		spec package: 'Toplo-Serialization-STON'.
+		spec package: 'Toplo-Serialization-Stash'.
+		spec package: 'Toplo-Serialization' with: [
+			spec requires:
+				#( 'Toplo' 'BlocSerialization' 'Toplo-Serialization-STON'
+				   'Toplo-Serialization-Stash' ) ].
 		spec
-			package: 'Toplo-Serialization'
-			 ]
+			package: 'Toplo-Serialization-Tests'
+			with: [ spec requires: #( 'Toplo-Serialization' ) ] ]
 ]
 
 { #category : #baselines }
 BaselineOfToploSerialization >> dependency: spec [
 
-	spec
-		baseline: 'Ston'
-		with: [ spec repository: 'github://svenvc/ston/repository' ].
-
 	spec
 		baseline: #BlocSerialization
 		with: [
 		spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ].
 
-	spec baseline: 'Toplo' with: [ spec repository: 'github://pharo-graphics/Toplo:master/src' ].
-
-
+	spec
+		baseline: 'Toplo'
+		with: [ spec repository: 'github://pharo-graphics/Toplo:dev/src' ]
 ]

src/Toplo-Serialization-STON/ToButton.extension.st

@@ -0,0 +1,40 @@
+Extension { #name : #ToButton }
+
+{ #category : #'*Toplo-Serialization-STON' }
+ToButton >> stonPostReferenceResolution [
+
+	super stonPostReferenceResolution.
+
+	"LabeledIcon"
+	self userData at: #stonLabeledIcon ifPresent: [ :anElement |
+		(self class slotNamed: #labeledIcon) write: anElement to: self.
+		self addChild: anElement.
+		self userData removeKey: #stonLabeledIcon ].
+
+	"Checkable"
+	self userData at: #stonIsCheckable ifAbsent: [ ^ self ].
+	self beCheckable.
+	self userData at: #stonChecked ifPresent: [ :aCheckValue |
+		self checked: aCheckValue.
+		self userData removeKey: #stonChecked ].
+	self userData at: #stonGroup ifPresent: [ :aGroup |
+		aGroup register: self.
+		self userData removeKey: #stonGroup ]
+]
+
+{ #category : #'*Toplo-Serialization-STON' }
+ToButton >> stonUserDataOn: aIdentityDictionary [
+
+	super stonUserDataOn: aIdentityDictionary.
+
+	"LabeledIcon"
+	(self class usesTrait: TToElementWithLabeledIcon) ifTrue: [
+		aIdentityDictionary at: #stonLabeledIcon put: self labeledIcon ].
+
+	"Checkable"
+	self isCheckable ifFalse: [ ^ self ].
+	aIdentityDictionary at: #stonIsCheckable put: self isCheckable.
+	aIdentityDictionary at: #stonChecked put: self isChecked.
+	self group ifNotNil: [
+		aIdentityDictionary at: #stonGroup put: self group ]
+]

src/Toplo-Serialization/ToCheckableGroup.extension.st → src/Toplo-Serialization-STON/ToCheckableGroup.extension.st

@@ -1,21 +1,21 @@
 Extension { #name : #ToCheckableGroup }
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToCheckableGroup >> fromSton: stonReader [
 
 	stonReader parseMapDo: [ :key :value |
 		key = #checkingStrategy ifTrue: [ self checkingStrategy: value ] ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToCheckableGroup >> stonOn: stonWriter [
 
 	stonWriter writeObject: self streamMap: [ :dictionary |
 		dictionary
 			at: #checkingStrategy put: self checkingStrategy ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToCheckableGroup >> stonProcessSubObjects: block [
 
 	self

src/Toplo-Serialization/ToCheckbox.extension.st → src/Toplo-Serialization-STON/ToCheckbox.extension.st

@@ -1,21 +1,22 @@
 Extension { #name : #ToCheckbox }
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToCheckbox >> stonPostReferenceResolution [
 
 	super stonPostReferenceResolution.
 	self userData at: #stonChecked ifPresent: [ :aCheckValue |
 		self checked: aCheckValue.
 		self userData removeKey: #stonChecked ].
 	self userData at: #stonGroup ifPresent: [ :aGroup |
-		aGroup add: self.
+		aGroup register: self.
 		self userData removeKey: #stonGroup ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToCheckbox >> stonUserDataOn: aIdentityDictionary [
 
 	super stonUserDataOn: aIdentityDictionary.
 	aIdentityDictionary at: #stonChecked put: self checked.
-	self group ifNotNil: [ aIdentityDictionary at: #stonGroup put: self group. ]
+	self group ifNotNil: [
+		aIdentityDictionary at: #stonGroup put: self group ]
 ]

src/Toplo-Serialization-STON/ToElement.extension.st

@@ -0,0 +1,34 @@
+Extension { #name : #ToElement }
+
+{ #category : #'*Toplo-Serialization-STON' }
+ToElement >> stonPostReferenceResolution [
+
+	super stonPostReferenceResolution.
+	self userData at: #tooltipContent ifPresent: [ :anElement |
+		self tooltipContent: anElement.
+		self userData removeKey: #tooltipContent ].
+]
+
+{ #category : #'*Toplo-Serialization-STON' }
+ToElement >> stonUserDataOn: aIdentityDictionary [
+
+	super stonUserDataOn: aIdentityDictionary.
+	"TToEnableable"
+	self userData
+		at: #enabled
+		ifPresent: [ :id | aIdentityDictionary at: #enabled put: id ].
+
+	"TToElementWithTooltip"
+	self hasTooltip ifTrue: [
+		aIdentityDictionary
+			at: #tooltipContent
+			put: (self rawTooltipWindowManager builder asContext tempAt: 3).
+		self userData at: #tooltipPopupDelay ifPresent: [ :aDuration |
+			aIdentityDictionary at: #tooltipPopupDelay put: aDuration ].
+		self userData
+			at: #closeTooltipWindowOnMouseLeave
+			ifPresent: [ :aBoolean |
+				aIdentityDictionary
+					at: #closeTooltipWindowOnMouseLeave
+					put: aBoolean ] ]
+]

src/Toplo-Serialization/ToImage.extension.st → src/Toplo-Serialization-STON/ToImage.extension.st

@@ -1,6 +1,6 @@
 Extension { #name : #ToImage }
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToImage >> stonPostReferenceResolution [
 
 	super stonPostReferenceResolution.
@@ -9,7 +9,7 @@ ToImage >> stonPostReferenceResolution [
 		self userData removeKey: #stonInnerImage ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToImage >> stonUserDataOn: aIdentityDictionary [
 
 	super stonUserDataOn: aIdentityDictionary.

src/Toplo-Serialization/ToLabel.extension.st → src/Toplo-Serialization-STON/ToLabel.extension.st

@@ -1,6 +1,6 @@
 Extension { #name : #ToLabel }
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToLabel >> stonPostReferenceResolution [
 
 	super stonPostReferenceResolution.
@@ -9,7 +9,7 @@ ToLabel >> stonPostReferenceResolution [
 		self userData removeKey: #stonToLabelText ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToLabel >> stonUserDataOn: aIdentityDictionary [
 
 	super stonUserDataOn: aIdentityDictionary.

src/Toplo-Serialization/ToLabeledIcon.extension.st → src/Toplo-Serialization-STON/ToLabeledIcon.extension.st

@@ -1,6 +1,6 @@
 Extension { #name : #ToLabeledIcon }
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToLabeledIcon >> stonPostReferenceResolution [
 
 	super stonPostReferenceResolution.
@@ -12,7 +12,7 @@ ToLabeledIcon >> stonPostReferenceResolution [
 		self userData removeKey: #stonToImage ]
 ]
 
-{ #category : #'*Toplo-Serialization' }
+{ #category : #'*Toplo-Serialization-STON' }
 ToLabeledIcon >> stonUserDataOn: aIdentityDictionary [
 
 	super stonUserDataOn: aIdentityDictionary.

src/Toplo-Serialization-STON/package.st

@@ -0,0 +1 @@
+Package { #name : #'Toplo-Serialization-STON' }

src/Toplo-Serialization-Stash/BlElement.extension.st

@@ -0,0 +1,30 @@
+Extension { #name : #BlElement }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+BlElement >> allSetterAndGettersForMyStashAllStamps [
+
+	<stashAccessors>
+	self allStamps isEmpty ifTrue: [ ^ {  } ].
+	^ self toStyleStore stampIndex allProperties collect: [ :assoc | | setter getter |
+		setter := [ :element | 'addStamp: <1p> withValue:' expandMacrosWith: assoc value name ].
+		getter := [ :element | assoc value value ].
+		setter -> getter
+		 ]
+
+
+]
+
+{ #category : #'*Toplo-Serialization-Stash' }
+BlElement >> allSetterAndGettersForMyStashAllTokens [
+
+	<stashAccessors>
+	self ensuredToStyleStore.
+	self toStyleStore tokenPropertyIndex isEmpty ifTrue: [ ^ {  } ].
+	^ self toStyleStore tokenPropertyIndex allProperties collect: [ :assoc | | setter getter |
+		setter := [ :element | 'addTokenNamed: <1p> withValue:' expandMacrosWith: assoc value name ].
+		getter := [ :element | assoc value value ].
+		setter -> getter
+		 ]
+
+
+]

src/Toplo-Serialization-Stash/TToCheckable.extension.st

@@ -0,0 +1,12 @@
+Extension { #name : #TToCheckable }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+TToCheckable >> allSetterAndGettersOfTraitForMyStash: aToElement [
+
+	| settersAndGetters |
+	self isCheckable ifFalse: [ ^ {  } ].
+	settersAndGetters := OrderedCollection new.
+	settersAndGetters add: #checked.
+	settersAndGetters add: #group.
+	^ settersAndGetters
+]

src/Toplo-Serialization-Stash/TToElementWithLabeledIcon.extension.st

@@ -0,0 +1,25 @@
+Extension { #name : #TToElementWithLabeledIcon }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+TToElementWithLabeledIcon >> allSetterAndGettersOfTraitForMyStash: aToElement [
+
+	| settersAndGetters |
+	settersAndGetters := OrderedCollection new.
+	aToElement isStartToEnd ifTrue: [ settersAndGetters add: (#beStartToEnd -> nil) onlySetOnStash ].
+	aToElement isEndToStart ifTrue: [ settersAndGetters add: (#beEndToStart -> nil) onlySetOnStash ].
+
+	aToElement isVertical ifTrue: [ settersAndGetters add: (#isVertical -> nil) onlySetOnStash ].
+	aToElement isHorizontal ifTrue: [ settersAndGetters add: (#isHorizontal -> nil) onlySetOnStash ].
+
+	settersAndGetters add: #endAlignment.
+	settersAndGetters add: #endElement.
+	settersAndGetters add: #endInterspace.
+	settersAndGetters add: #flexible.
+	settersAndGetters add: #icon.
+	settersAndGetters add: #iconContainerHeight.
+	settersAndGetters add: #iconContainerWidth.
+	settersAndGetters add: #label.
+	settersAndGetters add: #startAlignment.
+	settersAndGetters add: #startInterspace.
+	^ settersAndGetters
+]

src/Toplo-Serialization-Stash/TToElementWithTooltip.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : #TToElementWithTooltip }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+TToElementWithTooltip >> allSetterAndGettersOfTraitForMyStash: aToElement [
+
+	self hasTooltip ifFalse: [ ^ {  } ].
+	^ { #tooltipBuilder. #closeTooltipWindowOnMouseLeave . #tooltipPopupDelay }
+]

src/Toplo-Serialization-Stash/TToEnableable.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : #TToEnableable }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+TToEnableable >> allSetterAndGettersOfTraitForMyStash: aToElement [
+
+	aToElement isEnabled ifTrue: [ ^ {  } ].
+	^ { #enabled: -> #isEnabled }
+]

src/Toplo-Serialization-Stash/ToButton.extension.st

@@ -0,0 +1,9 @@
+Extension { #name : #ToButton }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+ToButton >> stashToButtonCheckable [
+
+	<stashAccessors>
+	self isCheckable ifFalse: [ ^ {  } ].
+	^ { (#beCheckable -> self) onlySetOnStash }
+]

src/Toplo-Serialization-Stash/ToCheckableGroup.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : #ToCheckableGroup }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+ToCheckableGroup >> stashAccessorsForCheckableGroup [
+
+	<stashAccessors>
+	^ { #registerAll: -> #registeredCheckables }
+]

src/Toplo-Serialization-Stash/ToImage.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : #ToImage }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+ToImage >> stashAccessorsForInnerImage [
+
+	<stashAccessors>
+	^ { #innerImage }
+]

src/Toplo-Serialization-Stash/ToLabel.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : #ToLabel }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+ToLabel >> stashAccessorsForText [
+
+	<stashAccessors>
+	^ { #text }
+]

src/Toplo-Serialization-Stash/ToObservableCollection.extension.st

@@ -0,0 +1,10 @@
+Extension { #name : #ToObservableCollection }
+
+{ #category : #'*Toplo-Serialization-Stash' }
+ToObservableCollection >> asStashObject [
+
+	^ StashCollection new
+		  object: collection;
+		  classType: collection class;
+		  yourself
+]

src/Toplo-Serialization-Stash/package.st

@@ -0,0 +1 @@
+Package { #name : #'Toplo-Serialization-Stash' }

src/Toplo-Serialization/ToElementWithLeafForTesting.class.st → src/Toplo-Serialization-Tests/ToElementWithLeafForTesting.class.st

@@ -1,5 +1,5 @@
 Class {
 	#name : #ToElementWithLeafForTesting,
 	#superclass : #ToElement,
-	#category : #'Toplo-Serialization-cases-test'
+	#category : #'Toplo-Serialization-Tests'
 }