Deprecate #numberOfInstanceVariables since it's a duplicated of #inst…

…Size.
jecisc · Nov 5, 2019 · e2cd188 · e2cd188
1 parent f680827
commit e2cd188
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/src/Deprecated80/Behavior.extension.st b/src/Deprecated80/Behavior.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #Behavior }
+
+{ #category : #'*Deprecated80' }
+Behavior >> numberOfInstanceVariables [
+	self deprecated: 'Use #instSize or `slots size` instead.' transformWith: '`@receiver numberOfInstanceVariables' -> '`@receiver instSize'.
+	^ self instSize
+]
diff --git a/src/Kernel-Tests/BehaviorTest.class.st b/src/Kernel-Tests/BehaviorTest.class.st
@@ -110,6 +110,13 @@ BehaviorTest >> testIncludesMethod [
 	self deny: (LookupKey includesMethod: Point>>#x).
 ]
 
+{ #category : #metrics }
+BehaviorTest >> testInstSize [
+	self assert: Object instSize equals: 0.
+	self assert: Point instSize equals: 2.
+	self assert: Metaclass instSize equals: 1
+]
+
 { #category : #tests }
 BehaviorTest >> testIsAbstract [
 
@@ -179,13 +186,6 @@ BehaviorTest >> testMethodsWritingSlot [
 	self assert: numberViaSlot = numberViaIVar.
 ]
 
-{ #category : #metrics }
-BehaviorTest >> testNumberOfInstanceVariables [
-	self assert: Object numberOfInstanceVariables equals: 0.
-	self assert: Point numberOfInstanceVariables equals: 2.
-	self assert: Metaclass numberOfInstanceVariables equals: 1
-]
-
 { #category : #'tests - properties' }
 BehaviorTest >> testPropertyValueAtPut [
 	| testValue |

diff --git a/src/Kernel/Behavior.class.st b/src/Kernel/Behavior.class.st
@@ -1359,12 +1359,6 @@ Behavior >> nonObsoleteClass [
 	^ self environment at: obsName asSymbol
 ]
 
-{ #category : #accessing }
-Behavior >> numberOfInstanceVariables [
-	^ self instVarNames size
-
-]
-
 { #category : #initialization }
 Behavior >> obsolete [
 	"nothing to be done"

diff --git a/src/Morphic-Widgets-FastTable/FTExampleClassInfoTableDataSource.class.st b/src/Morphic-Widgets-FastTable/FTExampleClassInfoTableDataSource.class.st
@@ -72,7 +72,7 @@ FTExampleClassInfoTableDataSource >> nameColumn: column row: rowIndex [
 { #category : #accessing }
 FTExampleClassInfoTableDataSource >> numberOfInstanceVariablesColumn: column row: rowIndex [
 	^ FTCellMorph new 
-		addMorph: (self elementAt: rowIndex) numberOfInstanceVariables asStringMorph;
+		addMorph: (self elementAt: rowIndex) instSize asStringMorph;
 		yourself
 ]
 

diff --git a/src/Morphic-Widgets-FastTable/FTExamples.class.st b/src/Morphic-Widgets-FastTable/FTExamples.class.st
@@ -611,7 +611,7 @@ FTExamples class >> exampleSortableTable2 [
 				yourself);
 		addColumn:
 			((FTColumn id: 'Number of instance variables')
-				sortableOnProperty: #numberOfInstanceVariables;
+				sortableOnProperty: #instSize;
 				yourself);
 		dataSource: FTExampleClassInfoTableDataSource new;
 		selectFirst;
@@ -645,7 +645,7 @@ FTExamples class >> exampleSortableTable3 [
 				yourself);
 		addColumn:
 			((FTColumn id: 'Number of instance variables')
-				sortableUsing: #numberOfInstanceVariables ascending , #name ascending; "Sort by number of inst var, if the same, sort by name."
+				sortableUsing: #instSize ascending , #name ascending; "Sort by number of inst var, if the same, sort by name."
 				yourself);
 		dataSource: FTExampleClassInfoTableDataSource new;
 		selectFirst;