Fixes: #3222

Finished to hardcode RBRefactoryChangeManager everywhere. 
Finished to hardcode Smalltalk globals.

src/NautilusRefactoring/RBAddMethodChange.extension.st

@@ -24,25 +24,3 @@ RBAddMethodChange >> accept: aText notifying: aController [
 
 	^ true
 ]
-
-{ #category : #'*NautilusRefactoring' }
-RBAddMethodChange >> oldVersionTextToDisplay [
-	| class |
-
-	class := Smalltalk 
-				at: className asSymbol
-				ifAbsent: [ ^ super oldVersionTextToDisplay ].
-
-	isMeta ifTrue: [ class := class classSide ].
-
-	^ class methodDict 
-			at: self selector
-			ifPresent: [:method | method sourceCode ]
-			ifAbsent: [ super oldVersionTextToDisplay ]
-]
-
-{ #category : #'*NautilusRefactoring' }
-RBAddMethodChange >> textToDisplay [
-
-	^ self source
-]

src/Refactoring-Changes/RBAddClassChange.class.st

@@ -34,12 +34,12 @@ RBAddClassChange class >> definitionPatterns [
 { #category : #converting }
 RBAddClassChange >> asUndoOperation [
 	| class |
-	class := Smalltalk globals
-		at: self changeClassName
-		ifAbsent: [ nil ].
+	class := onSystemDictionary 
+					at: self changeClassName
+					ifAbsent: [ nil ].
 	^ class isBehavior
-		ifTrue: [ RBRefactoryChangeManager changeFactory addClassDefinition: class definition ]
-		ifFalse: [ RBRefactoryChangeManager changeFactory removeClassNamed: self changeClassName ]
+		ifTrue: [ changeFactory addClassDefinition: class definition ]
+		ifFalse: [ changeFactory removeClassNamed: self changeClassName ]
 ]
 
 { #category : #accessing }
@@ -54,7 +54,7 @@ RBAddClassChange >> classVariableNames [
 
 { #category : #private }
 RBAddClassChange >> definitionClass [
-	^ Smalltalk globals at: (self superclassName ifNil: [ ^ ProtoObject ])
+	^ onSystemDictionary at: (self superclassName ifNil: [ ^ ProtoObject ])
 ]
 
 { #category : #private }
@@ -82,7 +82,7 @@ RBAddClassChange >> instanceVariableNames [
 	^ instanceVariableNames
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 RBAddClassChange >> nameToDisplay [
 
 	^ self changeString
@@ -97,3 +97,9 @@ RBAddClassChange >> sharedPoolNames [
 RBAddClassChange >> superclassName [
 	^ superclassName
 ]
+
+{ #category : #accessing }
+RBAddClassChange >> textToDisplay [
+
+	^ self definition
+]

src/Refactoring-Changes/RBAddClassVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBAddClassVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory
+	^ changeFactory
 		removeClassVariable: self variable
 		from: self changeClass
 ]

src/Refactoring-Changes/RBAddInstanceVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBAddInstanceVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory removeInstanceVariable: self variable from: self changeClass
+	^ changeFactory removeInstanceVariable: self variable from: self changeClass
 ]
 
 { #category : #printing }

src/Refactoring-Changes/RBAddMethodChange.class.st

@@ -54,8 +54,8 @@ RBAddMethodChange >> asUndoOperation [
 			oldProtocol := RBBrowserEnvironment new whichProtocolIncludes: self selector in: self changeClass.
 			oldProtocol isNil
 				ifTrue: [ oldProtocol := #accessing ].
-			RBRefactoryChangeManager changeFactory addMethodSource: (self methodSourceFor: self selector) in: self changeClass classified: oldProtocol ]
-		ifFalse: [ RBRefactoryChangeManager changeFactory removeMethod: selector from: self changeClass ]
+			changeFactory addMethodSource: (self methodSourceFor: self selector) in: self changeClass classified: oldProtocol ]
+		ifFalse: [ changeFactory removeMethod: selector from: self changeClass ]
 ]
 
 { #category : #accessing }
@@ -120,6 +120,22 @@ RBAddMethodChange >> hash [
 	^ self parseTree hash
 ]
 
+{ #category : #accessing }
+RBAddMethodChange >> oldVersionTextToDisplay [
+	| class |
+
+	class := onSystemDictionary  
+					at: className asSymbol
+					ifAbsent: [ ^ super oldVersionTextToDisplay ].
+
+	isMeta ifTrue: [ class := class classSide ].
+
+	^ class methodDict 
+			at: self selector
+			ifPresent: [:method | method sourceCode ]
+			ifAbsent: [ super oldVersionTextToDisplay ]
+]
+
 { #category : #private }
 RBAddMethodChange >> parseTree [
 	^ RBParser parseMethod: source onError: [ :str :pos | ^ nil ]
@@ -183,3 +199,9 @@ RBAddMethodChange >> selector [
 RBAddMethodChange >> source [
 	^ source
 ]
+
+{ #category : #accessing }
+RBAddMethodChange >> textToDisplay [
+
+	^ self source
+]

src/Refactoring-Changes/RBAddPoolVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBAddPoolVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory removePoolVariable: self variable from: self changeClass
+	^ changeFactory removePoolVariable: self variable from: self changeClass
 ]
 
 { #category : #accessing }

src/Refactoring-Changes/RBAddTraitChange.class.st

@@ -20,12 +20,12 @@ RBAddTraitChange class >> definitionPatterns [
 { #category : #converting }
 RBAddTraitChange >> asUndoOperation [
 	| trait |
-	trait := Smalltalk globals
+	trait := onSystemDictionary 
 		at: self changeClassName
 		ifAbsent: [ nil ].
 	^ trait isTrait
-		ifTrue: [ RBRefactoryChangeManager changeFactory addTraitDefinition: trait definition ]
-		ifFalse: [ RBRefactoryChangeManager changeFactory removeClassNamed: self changeClassName ]
+		ifTrue: [ changeFactory addTraitDefinition: trait definition ]
+		ifFalse: [ changeFactory removeClassNamed: self changeClassName ]
 ]
 
 { #category : #accessing }

src/Refactoring-Changes/RBRefactoryChange.class.st

@@ -77,7 +77,7 @@ RBRefactoryChange >> name: aString [
 	name := aString
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 RBRefactoryChange >> nameToDisplay [
 
 	^ self name

src/Refactoring-Changes/RBRefactoryClassChange.class.st

@@ -35,7 +35,7 @@ RBRefactoryClassChange >> asUndoOperation [
 { #category : #accessing }
 RBRefactoryClassChange >> changeClass [
 	| class |
-	class := Smalltalk globals at: self changeClassName ifAbsent: [ ^ nil ].
+	class := onSystemDictionary at: self changeClassName ifAbsent: [ ^ nil ].
 	^ isMeta ifTrue: [ class classSide ] ifFalse: [ class ]
 ]
 

src/Refactoring-Changes/RBRemoveClassChange.class.st

@@ -20,7 +20,7 @@ RBRemoveClassChange class >> removeClassName: aSymbol [
 { #category : #converting }
 RBRemoveClassChange >> asUndoOperation [
 	| classChanges |
-	classChanges := RBRefactoryChangeManager changeFactory compositeRefactoryChange.
+	classChanges := changeFactory compositeRefactoryChange.
 	self changeClass withAllSubclasses do: [ :each | 
 		classChanges defineClass: each definition.
 		each class instVarNames 

src/Refactoring-Changes/RBRemoveClassVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBRemoveClassVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory addClassVariable: self variable to: self changeClass
+	^ changeFactory addClassVariable: self variable to: self changeClass
 ]
 
 { #category : #accessing }

src/Refactoring-Changes/RBRemoveInstanceVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBRemoveInstanceVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory addInstanceVariable: self variable to: self changeClass
+	^ changeFactory addInstanceVariable: self variable to: self changeClass
 ]
 
 { #category : #printing }

src/Refactoring-Changes/RBRemoveMethodChange.class.st

@@ -28,7 +28,7 @@ RBRemoveMethodChange >> = aRemoveMethodChange [
 
 { #category : #converting }
 RBRemoveMethodChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory addMethodSource: (self methodSourceFor: selector) in: self changeClass
+	^ changeFactory addMethodSource: (self methodSourceFor: selector) in: self changeClass
 ]
 
 { #category : #printing }

src/Refactoring-Changes/RBRemovePoolVariableChange.class.st

@@ -9,7 +9,7 @@ Class {
 
 { #category : #converting }
 RBRemovePoolVariableChange >> asUndoOperation [
-	^ RBRefactoryChangeManager changeFactory addPoolVariable: self variable to: self changeClass
+	^ changeFactory addPoolVariable: self variable to: self changeClass
 ]
 
 { #category : #accessing }

src/Refactoring-Changes/RBRenameClassChange.class.st

@@ -50,7 +50,7 @@ RBRenameClassChange >> hash [
 	^ (self class hash bitXor: self oldName hash) bitXor: self newName hash
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 RBRenameClassChange >> nameToDisplay [
 
 	^ self printString
@@ -66,6 +66,13 @@ RBRenameClassChange >> oldName [
 	^ oldName
 ]
 
+{ #category : #accessing }
+RBRenameClassChange >> oldVersionTextToDisplay [
+	^ String streamContents: [ :s | 
+			self changes do: [ :c | 	s << c oldVersionTextToDisplay; cr ]]
+
+]
+
 { #category : #printing }
 RBRenameClassChange >> printOn: aStream [ 
 	aStream
@@ -89,3 +96,17 @@ RBRenameClassChange >> renameChangesForClass: oldClassName to: newClassName [
 		ifTrue: [ change rename: newClassName to: newName ].
 	^ change
 ]
+
+{ #category : #accessing }
+RBRenameClassChange >> textToDisplay [
+	^ String streamContents: [ :s | 
+         s << self printString ; cr.
+         self changes do: [ :c | 	s << c textToDisplay; cr ]]
+
+]
+
+{ #category : #accessing }
+RBRenameClassChange >> whatToDisplayIn: aChangeBrowser [
+	^ { self }
+
+]

src/Refactoring-Changes/RBRenameClassVariableChange.class.st

@@ -37,6 +37,8 @@ RBRenameClassVariableChange >> printOn: aStream [
 
 { #category : #private }
 RBRenameClassVariableChange >> removeOldVariable [
+	self flag: #todo.
+	"We should use the factory"
 	(RBRemoveClassVariableChange remove: oldName from: self changeClass)
 		execute
 ]

src/Refactoring-Changes/RBRenameInstanceVariableChange.class.st

@@ -10,6 +10,8 @@ Class {
 
 { #category : #private }
 RBRenameInstanceVariableChange >> addNewVariable [
+	self flag: #todo.
+	"We should use the factory"
 	(RBAddInstanceVariableChange add: newName to: self changeClass)
 		execute
 ]
@@ -40,6 +42,8 @@ RBRenameInstanceVariableChange >> printOn: aStream [
 
 { #category : #private }
 RBRenameInstanceVariableChange >> removeOldVariable [
+	self flag: #todo.
+	"We should use the factory"
 	(RBRemoveInstanceVariableChange remove: oldName from: self changeClass) 
 		execute
 ]

src/Refactoring-Changes/RBRenameVariableChange.class.st

@@ -108,7 +108,7 @@ RBRenameVariableChange >> isMeta [
 	^ isMeta
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 RBRenameVariableChange >> nameToDisplay [
 
 	^ 'Rename ', self oldName, ' into ', self newName
@@ -139,7 +139,21 @@ RBRenameVariableChange >> printOn: aStream [
 	aStream nextPutAll: self displayString
 ]
 
-{ #category : #private }
+{ #category : #accessing }
 RBRenameVariableChange >> removeOldVariable [
 	self subclassResponsibility
 ]
+
+{ #category : #accessing }
+RBRenameVariableChange >> textToDisplay [
+
+	self printString
+]
+
+{ #category : #accessing }
+RBRenameVariableChange >> whatToDisplayIn: aChangeBrowser [
+
+	| result |
+	result := OrderedCollection with: self.
+	^ result, (self changes flatCollect: [:e | e changes ])
+]