Cleanup uiManager from Object

src/Morphic-Core/WorldState.class.st

@@ -184,7 +184,7 @@ WorldState class >> pharoItemsOn: aBuilder [
 						keyText: 'S';
 						iconName: #smallSave.
 					(aBuilder item: #'Save as...')
-						target: self;
+						target: aBuilder model;
 						selector: #saveAs;
 						help: 'Save the current version of the image on disk under a new name.';
 						order: 2;
@@ -235,15 +235,6 @@ WorldState class >> saveAndQuit [
 	]
 ]
 
-{ #category : 'world menu items' }
-WorldState class >> saveAs [
-
-	| reference |
-	reference := self uiManager chooseForSaveFileReference: 'Save Image as?' extensions: #( 'image' ) path: Smalltalk imageFile nextVersion.
-
-	reference ifNotNil: [ Smalltalk saveAs: reference parent / (reference basenameWithoutExtension: 'image') ]
-]
-
 { #category : 'world menu items' }
 WorldState class >> saveSession [
 	Cursor write showWhile: [
@@ -772,6 +763,17 @@ WorldState >> runStepMethodsIn: aWorld [
 	self runLocalStepMethodsIn: aWorld.
 ]
 
+{ #category : 'menu actions' }
+WorldState >> saveAs [
+
+	| reference |
+	reference := worldRenderer world morphicUIManager
+		             chooseForSaveFileReference: 'Save Image as?'
+		             extensions: #( 'image' )
+		             path: Smalltalk imageFile nextVersion.
+	reference ifNotNil: [ Smalltalk saveAs: reference parent / (reference basenameWithoutExtension: 'image') ]
+]
+
 { #category : 'hands' }
 WorldState >> selectHandsToDrawForDamage: damageList [
 	"Select the set of hands that must be redrawn because either (a) the hand itself has changed or (b) the hand intersects some damage rectangle."

src/SystemCommands-VariableCommands/SycGenerateVariableAccessorsWithLazyInitializationCommand.class.st

@@ -55,8 +55,8 @@ SycGenerateVariableAccessorsWithLazyInitializationCommand >> isComplexRefactorin
 SycGenerateVariableAccessorsWithLazyInitializationCommand >> prepareFullExecutionInContext: aToolContext [
 
 	super prepareFullExecutionInContext: aToolContext.
-	variable := aToolContext lastSelectedVariable.
-	value := self uiManager
+	variable := aToolContext lastSelectedVariable. 
+	value := aToolContext tool morphicUIManager
 		           request: 'Default value of variable accessor'
 		           initialAnswer: 'nil'
 		           title: 'Default variable''s value'.