Merge pull request #26 from OpenSmock/stash_cleanup

cleanup

Author: Nyan11

src/Bloc-Serialization-Stash/BlAffineCompositeTransformation.extension.st

@@ -1,7 +1,9 @@
 Extension { #name : #BlAffineCompositeTransformation }
 
 { #category : #'*Bloc-Serialization-Stash' }
-BlAffineCompositeTransformation >> allSetterAndGettersForMyStash [ 
+BlAffineCompositeTransformation >> stashAccessors [
 
-	^ self transformations flatCollect: [ :each | each allSetterAndGettersForMyStash ]
+	<stashAccessors>
+	^ self transformations flatCollect: [ :each |
+		  each allSetterAndGettersForMyStash ]
 ]

src/Bloc-Serialization-Stash/BlFlowLayout.extension.st

@@ -1,23 +1,19 @@
 Extension { #name : #BlFlowLayout }
 
 { #category : #'*Bloc-Serialization-Stash' }
-BlFlowLayout >> allSetterAndGettersForMyStash [
+BlFlowLayout >> asStashConstructor [
+
+	self orientation isVertical ifTrue: [ ^ 'BlFlowLayout vertical' ].
+	^ 'BlFlowLayout horizontal'
+]
+
+{ #category : #'*Bloc-Serialization-Stash' }
+BlFlowLayout >> stashAccessors [
 
-	"We ovverride this method to take into account the default value of alignment"
 	<stashAccessors>
 	| settersAndGetters |
 	settersAndGetters := OrderedCollection new.
-	(verticalAlignment == self defaultVerticalAlignment and: [
-		 horizontalAlignment == self defaultHorizontalAlignment ]) ifFalse: [
-		settersAndGetters addAll: self allSetterAndGettersForMyStashForMyTraits ].
 	self direction == self defaultDirection ifFalse: [
 		settersAndGetters add: #direction ].
 	^ settersAndGetters
 ]
-
-{ #category : #'*Bloc-Serialization-Stash' }
-BlFlowLayout >> asStashConstructor [
-
-	self orientation isVertical ifTrue: [ ^ 'BlFlowLayout vertical' ].
-	^ 'BlFlowLayout horizontal'
-]

src/Bloc-Serialization-Stash/BlLinearLayout.extension.st

@@ -1,15 +1,19 @@
 Extension { #name : #BlLinearLayout }
 
 { #category : #'*Bloc-Serialization-Stash' }
-BlLinearLayout >> allSetterAndGettersForMyStash [
+BlLinearLayout >> asStashConstructor [
 
+	self isVertical ifTrue: [ ^ 'BlLinearLayout vertical' ].
+	^ 'BlLinearLayout horizontal' 
+]
+
+{ #category : #'*Bloc-Serialization-Stash' }
+BlLinearLayout >> stashAccessors [
 	"We ovverride this method to take into account the default value of alignment"
+
 	<stashAccessors>
 	| settersAndGetters |
 	settersAndGetters := OrderedCollection new.
-	(verticalAlignment == self defaultVerticalAlignment and: [
-		 horizontalAlignment == self defaultHorizontalAlignment ]) ifFalse: [
-		settersAndGetters addAll: self allSetterAndGettersForMyStashForMyTraits ].
 	cellSpacing == 0.0 ifFalse: [ settersAndGetters add: #cellSpacing ].
 	interspace == 0.0 ifFalse: [ settersAndGetters add: #interspace ].
 	self direction == self defaultDirection ifFalse: [
@@ -23,10 +27,3 @@ BlLinearLayout >> allSetterAndGettersForMyStash [
 		settersAndGetters add: #weightSum ].
 	^ settersAndGetters
 ]
-
-{ #category : #'*Bloc-Serialization-Stash' }
-BlLinearLayout >> asStashConstructor [
-
-	self isVertical ifTrue: [ ^ 'BlLinearLayout vertical' ].
-	^ 'BlLinearLayout horizontal' 
-]

src/Bloc-Serialization-Stash/BlTextElement.extension.st

@@ -1,11 +1,5 @@
 Extension { #name : #BlTextElement }
 
-{ #category : #'*Bloc-Serialization-Stash' }
-BlTextElement >> allSetterAndGettersForMyStash [
-
-	^ super allSetterAndGettersForMyStash , { #text }
-]
-
 { #category : #'*Bloc-Serialization-Stash' }
 BlTextElement >> stashAccessors [
 

src/Bloc-Serialization-Stash/TBlAlignable.extension.st

@@ -1,20 +1,30 @@
 Extension { #name : #TBlAlignable }
 
 { #category : #'*Bloc-Serialization-Stash' }
-TBlAlignable >> allSetterAndGettersOfTraitForMyStash: anObject [
+TBlAlignable >> defaultStashAlignementTest [
 
-	^ { ([ :alignement |
-	   | val |
-	   val := #alignNone.
-	   alignement isAlignTopLeft ifTrue: [ val := #alignTopLeft ].
-	   alignement isAlignTopCenter ifTrue: [ val := #alignTopCenter ].
-	   alignement isAlignTopRight ifTrue: [ val := #alignTopRight ].
-	   alignement isAlignCenterLeft ifTrue: [ val := #alignCenterLeft ].
-	   alignement isAlignCenter ifTrue: [ val := #alignCenter ].
-	   alignement isAlignCenterRight ifTrue: [ val := #alignCenterRight ].
-	   alignement isAlignBottomLeft ifTrue: [ val := #alignBottomLeft ].
-	   alignement isAlignBottomCenter ifTrue: [
-		   val := #alignBottomCenter ].
-	   alignement isAlignBottomRight ifTrue: [ val := #alignBottomRight ].
-	   val ] -> self) onlySetOnStash }
+	^ (self verticalAlignment == self defaultVerticalAlignment and: [
+		 self horizontalAlignment == self defaultHorizontalAlignment ])
+]
+
+{ #category : #'*Bloc-Serialization-Stash' }
+TBlAlignable >> stashAccessorForTBlAlignable [
+
+	<stashAccessors>
+	self defaultStashAlignementTest ifTrue: [ ^ {  } ]. 
+	self isAlignTopLeft ifTrue: [ ^ { #alignTopLeft onlySetOnStash } ].
+	self isAlignTopCenter ifTrue: [ ^ { #alignTopCenter onlySetOnStash } ].
+	self isAlignTopRight ifTrue: [ ^ { #alignTopRight onlySetOnStash } ].
+	self isAlignCenterLeft ifTrue: [
+		^ { #alignCenterLeft onlySetOnStash } ].
+	self isAlignCenter ifTrue: [ ^ { #alignCenter onlySetOnStash } ].
+	self isAlignCenterRight ifTrue: [
+		^ { #alignCenterRight onlySetOnStash } ].
+	self isAlignBottomLeft ifTrue: [
+		^ { #alignBottomLeft onlySetOnStash } ].
+	self isAlignBottomCenter ifTrue: [
+		^ { #alignBottomCenter onlySetOnStash } ].
+	self isAlignBottomRight ifTrue: [
+		^ { #alignBottomRight onlySetOnStash } ].
+	^ {  }
 ]