The API of Protocol is, currently, misleading. A protocol has a metho…

…d #methods but this one does not return methods but selectors.

In this PR I updated the API to #methodSelectors to be explicit.

src/Calypso-SystemQueries/ClassDescription.extension.st

@@ -7,9 +7,7 @@ ClassDescription >> tagsForAllMethods [
 	| allProtocols |
 	allProtocols := self organization protocols reject: [ :each | each name = Protocol unclassified | each isExtensionProtocol ].
 
-	^ allProtocols select: [ :protocol |
-		protocol methods
-			ifEmpty: [ true ]
-			ifNotEmpty: [ :methods | methods anySatisfy: [ :method | self selectors includes: method ] ] ]
+	^ allProtocols
+		select: [ :protocol | protocol methodSelectors ifEmpty: [ true ] ifNotEmpty: [ :methods | methods anySatisfy: [ :method | self selectors includes: method ] ] ]
 		thenCollect: #name
 ]

src/Deprecated80/Protocol.extension.st

@@ -0,0 +1,31 @@
+Extension { #name : #Protocol }
+
+{ #category : #'*Deprecated80' }
+Protocol >> addMethod: aSymbol [
+	self deprecated: 'Use #addMethodSelector: instead' transformWith: '`@receiver addMethod: `@arg' -> '`@receiver addMethodSelector: `@arg'.
+	^ self addMethodSelector: aSymbol
+]
+
+{ #category : #'*Deprecated80' }
+Protocol >> methods [
+	self deprecated: 'Use #methodSelectors instead.' transformWith: '`@receiver methods' -> '`@receiver methodSelectors'.
+	^ self methodSelectors
+]
+
+{ #category : #'*Deprecated80' }
+Protocol >> methods: aCollection [
+	self deprecated: 'Use #methodSelectors: instead.' transformWith: '`@receiver methods: `@arg' -> '`@receiver methodSelectors: `@arg'.
+	^ self methodSelectors: aCollection
+]
+
+{ #category : #'*Deprecated80' }
+Protocol >> removeAllMethods [
+	self deprecated: 'Use #removeAllMethodSelectors instead' transformWith: '`@receiver removeAllMethods' -> '`@receiver removeAllMethodSelectors'.
+	^ self removeAllMethodSelectors
+]
+
+{ #category : #'*Deprecated80' }
+Protocol >> removeMethod: aSymbol [
+	self deprecated: 'Use #removeMethodSelector: instead' transformWith: '`@receiver removeMethod: `@arg' -> '`@receiver removeMethodSelector: `@arg'.
+	^ self removeMethodSelector: aSymbol
+]

src/Deprecated80/ProtocolOrganizer.extension.st

@@ -0,0 +1,7 @@
+Extension { #name : #ProtocolOrganizer }
+
+{ #category : #'*Deprecated80' }
+ProtocolOrganizer >> allMethods [
+	self deprecated: 'Use #allMethodSelectors instead' transformWith: '`@receiver allMethods' -> '`@receiver allMethodSelectors'.
+	^ self allMethodSelectors
+]

src/Kernel-Tests/ClassOrganizationTest.class.st

@@ -62,17 +62,17 @@ ClassOrganizationTest >> testListAtCategoryNamed [
 	self assertEmpty: methods.
 
 	methods := self organization listAtCategoryNamed: 'one'.
-	self assert: methods size = 1.
-	self assert: methods first = #one
+	self assert: methods size equals: 1.
+	self assert: methods first equals: #one
 ]
 
 { #category : #tests }
 ClassOrganizationTest >> testRemoveCategory [
-	self assert: self organization categories size = 2.
+	self assert: self organization categories size equals: 2.
 	self should: [ self organization removeCategory: 'one' ] raise: Error.
 	self organization removeCategory: 'empty'.
-	self assert: self organization categories size = 1.
-	self assert: self organization categories first = 'one'
+	self assert: self organization categories size equals: 1.
+	self assert: self organization categories first equals: 'one'
 ]
 
 { #category : #tests }

src/Kernel-Tests/MagnitudeTest.class.st

@@ -25,6 +25,7 @@ MagnitudeTest >> testBeBetweenAnd [
 	self assert: (30 beBetween: 20 and: 5) equals: 20.
 ]
 
+{ #category : #'as yet unclassified' }
 MagnitudeTest >> testBetweenAnd [
 	self assert: (3 between: 0 and: 5).
 	self assert: (5.0 between: 5.0 and: 5.0).

src/Kernel/AllProtocol.class.st

@@ -40,15 +40,13 @@ AllProtocol >> isVirtualProtocol [
 ]
 
 { #category : #accessing }
-AllProtocol >> methods [
-
-	^ self protocolOrganizer allMethods
+AllProtocol >> methodSelectors [
+	^ self protocolOrganizer allMethodSelectors
 ]
 
 { #category : #accessing }
 AllProtocol >> name [
-
-	^ (self methods isEmpty and: [ protocolOrganizer protocols isEmpty])
+	^ (self isEmpty and: [ protocolOrganizer protocols isEmpty ])
 		ifTrue: [ self class nullCategory ]
 		ifFalse: [ name ]
 ]

src/Kernel/Protocol.class.st

@@ -6,8 +6,8 @@ Class {
 	#name : #Protocol,
 	#superclass : #Object,
 	#instVars : [
-		'methods',
-		'name'
+		'name',
+		'methodSelectors'
 	],
 	#category : #'Kernel-Protocols'
 }
@@ -58,13 +58,12 @@ Protocol class >> unclassified [
 
 { #category : #accessing }
 Protocol >> addAllMethodsFrom: aProtocol [
-
-	aProtocol methods do: [ :each | self addMethod: each ].
+	aProtocol methodSelectors do: [ :each | self addMethodSelector: each ]
 ]
 
 { #category : #accessing }
-Protocol >> addMethod: aSymbol [
-	^ methods add: aSymbol
+Protocol >> addMethodSelector: aSymbol [
+	^ methodSelectors add: aSymbol
 ]
 
 { #category : #private }
@@ -80,22 +79,21 @@ Protocol >> canBeRenamed [
 { #category : #testing }
 Protocol >> includesSelector: selector [
 
-	^ methods includes: selector
+	^ methodSelectors includes: selector
 ]
 
 { #category : #initialization }
 Protocol >> initialize [
 
 	super initialize.
 
-	methods := IdentitySet new.
+	methodSelectors := IdentitySet new.
 	name := self class defaultName.
 ]
 
 { #category : #testing }
 Protocol >> isEmpty [
-
-	^ self methods isEmpty
+	^ self methodSelectors isEmpty
 ]
 
 { #category : #testing }
@@ -110,15 +108,13 @@ Protocol >> isVirtualProtocol [
 ]
 
 { #category : #accessing }
-Protocol >> methods [
-
-	^ methods
+Protocol >> methodSelectors [
+	^ methodSelectors
 ]
 
 { #category : #accessing }
-Protocol >> methods: anObject [
-
-	methods := anObject
+Protocol >> methodSelectors: anObject [
+	methodSelectors := anObject
 ]
 
 { #category : #accessing }
@@ -134,26 +130,23 @@ Protocol >> name: anObject [
 
 { #category : #printing }
 Protocol >> printOn: aStream [
-
-	aStream 
+	aStream
 		nextPutAll: self class name;
 		nextPutAll: ' (';
 		nextPutAll: self name;
 		nextPutAll: ') - ';
-		print: self methods size;
+		print: self methodSelectors size;
 		nextPutAll: ' selector(s)'
 ]
 
 { #category : #accessing }
-Protocol >> removeAllMethods [
-
-	^ methods removeAll.
+Protocol >> removeAllMethodSelectors [
+	^ methodSelectors removeAll
 ]
 
 { #category : #accessing }
-Protocol >> removeMethod: aSymbol [
-
-	^ methods remove: aSymbol
+Protocol >> removeMethodSelector: aSymbol [
+	^ methodSelectors remove: aSymbol
 ]
 
 { #category : #accessing }

src/Kernel/ProtocolOrganizer.class.st

@@ -33,9 +33,8 @@ ProtocolOrganizer >> addProtocolNamed: aName [
 ]
 
 { #category : #accessing }
-ProtocolOrganizer >> allMethods [
-
-	^ self protocols flatCollect: [:p | p methods ].
+ProtocolOrganizer >> allMethodSelectors [
+	^ self protocols flatCollect: [ :p | p methodSelectors ]
 ]
 
 { #category : #accessing }
@@ -57,19 +56,16 @@ ProtocolOrganizer >> allProtocolsNames [
 ]
 
 { #category : #'protocol - adding' }
-ProtocolOrganizer >> classify: aSymbol inProtocolNamed: aProtocolName [ 
+ProtocolOrganizer >> classify: aSymbol inProtocolNamed: aProtocolName [
 	| name protocol |
-
 	name := aProtocolName.
-	name = allProtocol name
-		ifTrue: [ name := Protocol unclassified ].
-
+	name = allProtocol name ifTrue: [ name := Protocol unclassified ].
+
 	"maybe here we should check if this method already belong to another protocol"
-	(self protocolsOfSelector: aSymbol) do: [:p | p removeMethod: aSymbol ].
+	(self protocolsOfSelector: aSymbol) do: [ :p | p removeMethodSelector: aSymbol ].
 	protocol := self getProtocolNamed: name ifNone: [ self addProtocolNamed: name ].
-
-	protocol addMethod: aSymbol
-
+
+	protocol addMethodSelector: aSymbol
 ]
 
 { #category : #private }
@@ -119,10 +115,9 @@ ProtocolOrganizer >> initialize [
 
 { #category : #'backward compatibility' }
 ProtocolOrganizer >> methodsInProtocolNamed: aName [
-	aName = AllProtocol defaultName 
-		ifTrue: [ ^ self allMethods ].
+	aName = AllProtocol defaultName ifTrue: [ ^ self allMethodSelectors ].
 
-	^ (self protocolNamed: aName) methods
+	^ (self protocolNamed: aName) methodSelectors
 ]
 
 { #category : #private }
@@ -133,7 +128,7 @@ ProtocolOrganizer >> moveMethodsFrom: fromProtocolNamed to: toProtocolNamed [
 	toProtocol := self protocolNamed: toProtocolNamed.
 
 	toProtocol addAllMethodsFrom: fromProtocol.
-	fromProtocol removeAllMethods.
+	fromProtocol removeAllMethodSelectors.
 
 	^ toProtocol.
 ]
@@ -190,7 +185,7 @@ ProtocolOrganizer >> removeEmptyProtocols [
 { #category : #accessing }
 ProtocolOrganizer >> removeMethod: aSymbol [
 
-	(self protocolsOfSelector: aSymbol) do: [ :p | p removeMethod: aSymbol ]
+	(self protocolsOfSelector: aSymbol) do: [ :p | p removeMethodSelector: aSymbol ]
 ]
 
 { #category : #'protocol - removing' }