Reduce the number of extensions

src/Spec2-Adapters-Morphic/Morph.extension.st

@@ -13,11 +13,3 @@ Morph >> presenter: aPresenter [
 		setProperty: #presenter 
 		toValue: aPresenter 
 ]
-
-{ #category : '*Spec2-Adapters-Morphic' }
-Morph >> spEnsureLayoutAndAddMorph: aMorph [
-
-	aMorph layoutFrame
-		ifNil: [ aMorph layoutFrame: LayoutFrame identity].
-	self addMorph: aMorph 
-]

src/Spec2-Adapters-Morphic/SpAbstractMorphicAdapter.class.st

@@ -53,7 +53,12 @@ SpAbstractMorphicAdapter >> adapt: aPresenter [
 
 { #category : 'protocol' }
 SpAbstractMorphicAdapter >> add: anAdapter [
-	self widgetDo: [ :w | w spEnsureLayoutAndAddMorph: anAdapter widget ]
+
+	self widgetDo: [ :w |
+			"Make sure the widget has a layout"
+			anAdapter widget layoutFrame
+				ifNil: [ anAdapter widget layoutFrame: LayoutFrame identity ].
+			w addMorph: anAdapter widget ]
 ]
 
 { #category : 'initialization' }

src/Spec2-Adapters-Morphic/SpMorphicButtonAdapter.class.st

@@ -147,14 +147,14 @@ SpMorphicButtonAdapter >> keyStroke: anEvent fromMorph: aMorph [
 
 { #category : 'widget API' }
 SpMorphicButtonAdapter >> label [
+
 	| labelString |
-
-	labelString := self presenter label 
-		ifNotNil: [ :aString | aString withAccentuatedCharacter: self presenter shortcutCharacter ].
-
-	^ self 
-		buildLabel: labelString 
-		withIcon: self presenter icon
+	labelString := self presenter label ifNotNil: [ :aString |
+		self
+			textFromString: aString
+			withAccentuatedCharacter: self presenter shortcutCharacter ].
+
+	^ self buildLabel: labelString withIcon: self presenter icon
 ]
 
 { #category : 'widget API' }
@@ -267,6 +267,20 @@ SpMorphicButtonAdapter >> styleName: aString [
 	styleName := aString
 ]
 
+{ #category : 'widget API' }
+SpMorphicButtonAdapter >> textFromString: aString withAccentuatedCharacter: aKey [
+
+	| text index |
+	text := aString asText copy.
+	aKey ifNil: [ ^ text ].
+	index := aString asLowercase indexOf: aKey name asLowercase.
+	index isZero ifTrue: [ ^ text ].
+
+	^ text
+		  addAttribute: TextEmphasis underlined from: index to: index;
+		  yourself
+]
+
 { #category : 'accessing' }
 SpMorphicButtonAdapter >> unscaledInitialExtent [
 

src/Spec2-Adapters-Morphic/Text.extension.st

@@ -5,18 +5,3 @@ Text >> localizedForPresenter: aPresenter [
 
 	^ self
 ]
-
-{ #category : '*Spec2-Adapters-Morphic' }
-Text >> withAccentuatedCharacter: aCharacter [
-
-	| text index | 
-	text := self copy.
-	aCharacter ifNil: [ ^ text ].
-	index := self asString asLowercase indexOf: aCharacter asLowercase.
-	index isZero
-		ifTrue: [ ^ text ].
-
-	^ text
-		addAttribute: TextEmphasis underlined from: index to: index;
-		yourself
-]

src/Spec2-Core/SpActionBarPresenter.class.st

@@ -66,7 +66,7 @@ SpActionBarPresenter >> centerPresenter: aPresenter [
 SpActionBarPresenter >> initialize [
 
 	super initialize.
-	items := Dictionary new asValueHolder
+	items := DictionaryValueHolder value: Dictionary new
 ]
 
 { #category : 'api' }

src/Spec2-Core/SpButtonBarPresenter.class.st

@@ -45,7 +45,7 @@ SpButtonBarPresenter >> canTakeKeyboardFocus [
 SpButtonBarPresenter >> initialize [
 
 	super initialize.
-	items := OrderedCollection new asValueHolder.
+	items := CollectionValueHolder value: OrderedCollection new.
 	self placeAtEnd
 ]
 
@@ -74,7 +74,7 @@ SpButtonBarPresenter >> items [
 SpButtonBarPresenter >> items: aCollectionOfButtonPresenters [
 	"Set buttons to show, taking elements in `aCollectionOfButtonPresenters`."
 
-	items := OrderedCollection new asValueHolder.
+	items := CollectionValueHolder value: OrderedCollection new.
 	aCollectionOfButtonPresenters 
 		do: [ :each | each owner: self ].
 	items addAll: aCollectionOfButtonPresenters

src/Spec2-Core/SpMenuGroupPresenter.class.st

@@ -96,7 +96,7 @@ SpMenuGroupPresenter >> fromSpec: aSpec [
 SpMenuGroupPresenter >> initialize [
 	super initialize.
 
-	items := OrderedCollection new asValueHolder
+	items := CollectionValueHolder value: OrderedCollection new
 ]
 
 { #category : 'testing' }

src/Spec2-Core/SpNotebookPresenter.class.st

@@ -57,7 +57,7 @@ SpNotebookPresenter >> hasPages [
 SpNotebookPresenter >> initialize [
 
 	super initialize.
-	pagesHolder := OrderedCollection new asValueHolder.
+	pagesHolder := CollectionValueHolder value: OrderedCollection new.
 	self whenSelectedPageChangedDo: [ :aPage | 
 		self withAdapterDo: [ :anAdapter | anAdapter selectPage: aPage ] ]
 ]

src/Spec2-Core/SpNumberInputFieldPresenter.class.st

@@ -139,10 +139,7 @@ SpNumberInputFieldPresenter >> minimum: aNumber [
 SpNumberInputFieldPresenter >> number [
 	"Answer the number ingressed."
 
-	^ self text trimmed 
-		ifNotEmpty: [ :aString | 
-			self numberType readFrom: aString ifFail: [ 0 ] ]
-		ifEmpty: [ 0 ]
+	^ self text trimBoth ifNotEmpty: [ :aString | self numberType readFrom: aString ifFail: [ 0 ] ] ifEmpty: [ 0 ]
 ]
 
 { #category : 'api' }

src/Spec2-Examples/SpDemoTextInputPresenter.class.st

@@ -27,11 +27,11 @@ SpDemoTextInputPresenter >> defaultLayout [
 		  add: 'Normal:' atPoint: 1 @ 1;
 		  add: fieldNormal atPoint: 2 @ 1 span: 2 @ 1;
 		  add: 'Disabled:' atPoint: 1 @ 2;
-		  add: fieldDisabled at: 2 @ 2 span: 2 @ 1;
-		  add: 'Placeholder:' at: 1 @ 3;
-		  add: fieldPlaceholderText at: 2 @ 3 span: 2 @ 1;
-		  add: 'Password:' at: 1 @ 4;
-		  add: fieldEncrypted at: 2 @ 4 span: 2 @ 1;
+		  add: fieldDisabled atPoint: 2 @ 2 span: 2 @ 1;
+		  add: 'Placeholder:' atPoint: 1 @ 3;
+		  add: fieldPlaceholderText atPoint: 2 @ 3 span: 2 @ 1;
+		  add: 'Password:' atPoint: 1 @ 4;
+		  add: fieldEncrypted atPoint: 2 @ 4 span: 2 @ 1;
 		  beColumnNotHomogeneous;
 		  yourself
 ]

src/Spec2-Morphic/SpPaginatorPresenter.class.st

@@ -66,7 +66,7 @@ SpPaginatorPresenter >> dragging: aNumber [
 SpPaginatorPresenter >> initialize [
 
 	super initialize.
-	pagesHolder := OrderedCollection new asValueHolder.
+	pagesHolder := CollectionValueHolder value: OrderedCollection new.
 	visiblePages := self class defaultVisiblePages
 ]
 

src/Spec2-Tests/SpComposablePresenterWithModelTest.class.st

@@ -27,7 +27,7 @@ SpComposablePresenterWithModelTest >> testInstanceCreationWithValueHolder [
 	| point valueHolder presenter |
 
 	point := (40@54).
-	valueHolder := point asValueHolder.
+	valueHolder := NewValueHolder value: point.
 	presenter := SpTestingPresenterWithModel on: valueHolder.
 
 	self assert: presenter model equals: point.

src/Spec2-Tests/SpGridLayoutBuilderTest.class.st

@@ -20,14 +20,14 @@ SpGridLayoutBuilderTest >> testBuilderAddsElementsOnRaw [
 	| layout presenters |
 	presenters := self newPresenters: 3.
 	layout := SpGridLayout build: [ :builder |
-		          builder
-			          add: presenters first;
-			          add: presenters second;
-			          add: presenters third ].
+			          builder
+				          add: presenters first;
+				          add: presenters second;
+				          add: presenters third ].
 
 	self assert: (layout atPoint: 1 @ 1) equals: presenters first.
 	self assert: (layout atPoint: 2 @ 1) equals: presenters second.
-	self assert: (layout at: 3 @ 1) equals: presenters third
+	self assert: (layout atPoint: 3 @ 1) equals: presenters third
 ]
 
 { #category : 'tests' }
@@ -36,18 +36,18 @@ SpGridLayoutBuilderTest >> testBuilderCanAddElementsOnMultipleRaws [
 	| layout presenters |
 	presenters := self newPresenters: 5.
 	layout := SpGridLayout build: [ :builder |
-		          builder
-			          add: presenters first;
-			          add: presenters second;
-			          nextRow;
-			          add: presenters third;
-			          nextRow;
-			          add: presenters fourth;
-			          add: presenters fifth ].
+			          builder
+				          add: presenters first;
+				          add: presenters second;
+				          nextRow;
+				          add: presenters third;
+				          nextRow;
+				          add: presenters fourth;
+				          add: presenters fifth ].
 
 	self assert: (layout atPoint: 1 @ 1) equals: presenters first.
 	self assert: (layout atPoint: 2 @ 1) equals: presenters second.
-	self assert: (layout at: 1 @ 2) equals: presenters third.
+	self assert: (layout atPoint: 1 @ 2) equals: presenters third.
 	self assert: (layout at: 1 @ 3) equals: presenters fourth.
 	self assert: (layout at: 2 @ 3) equals: presenters fifth
 ]

src/Spec2-Tests/SpTestLocalizedString.class.st

@@ -51,9 +51,3 @@ SpTestLocalizedString >> string [
 SpTestLocalizedString >> string: anObject [
 	string := anObject
 ]
-
-{ #category : 'accessing' }
-SpTestLocalizedString >> withAccentuatedCharacter: aCharacter [
-
-
-]