1712 self application inform inherits from object UI manager dependency

Iceberg-Plugin-GitHub/IceGitHubAction.class.st

@@ -23,6 +23,12 @@ IceGitHubAction >> credentials [
 	^ credentials ifNil: [ credentials := self obtainCredentials ]
 ]
 
+{ #category : #private }
+IceGitHubAction >> defaultApplication [
+
+	^ SpApplication defaultApplication
+]
+
 { #category : #executing }
 IceGitHubAction >> execute [
 	self withErrorHandlingDo: [ 
@@ -63,13 +69,13 @@ IceGitHubAction >> remote: anObject [
 
 { #category : #private }
 IceGitHubAction >> reportError: error [
-	
+
 	| message |
 	message := error messageBody.
-	message = 'Invalid field: head'
-		ifTrue: [ message := 'Branch does not exist on github. Please commit and push your changes.' ].
-	SpApplication defaultApplication newInform
+	message = 'Invalid field: head' ifTrue: [
+		message := 'Branch does not exist on github. Please commit and push your changes.' ].
+	self defaultApplication newInform
 		label: message;
-		title: 'Error creating pull request: ', error messageText;
+		title: 'Error creating pull request: ' , error messageText;
 		openModal
 ]

Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st

@@ -204,12 +204,12 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [
 			         getIssue: remote owner
 			         project: remote projectName
 			         number: number.
-		self defaultApplication defer: [
+		self defer: [
 			self updateText: (self sanitizeTitle: (issue at: 'title')) ] ]
 			on: IceGitHubError
 			do: [ :e |
 				e messageText = 'Not Found' ifFalse: [ e pass ].
-				self defaultApplication defer: [
+				self defer: [
 					self updateText: self unknownTitle ] ] ]
 ]
 

Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st

@@ -44,28 +44,29 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [
 
 		pullRequestDatas := pullRequest send.
 		url := pullRequestDatas at: 'html_url'.
-		UIManager default
-			inform: 'Pull request created. Click to view on Github.' 
-			actionOnClick: [ WebBrowser openOn: url ] 
+		self defaultApplication newInform
+			title: 'Pull request created. Click to view on Github.';
+			onAccept: [ WebBrowser openOn: url ];
+			openModal.
 	]
 	on: IceGitHubError
 	do: [ :e | self reportError: e ]
 ]
 
 { #category : #private }
 IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [
+
 	| status |
-
 	status := OrderedCollection new: 2.
-	aRepository isModified 
-		ifTrue: [ status add: 'Uncommited changes' ].
-	(aRepository outgoingCommitsTo: remote) 
-		ifNotEmpty: [ :commits | '{1} not published' format: { commits size } ].
+	aRepository isModified ifTrue: [ status add: 'Uncommited changes' ].
+	(aRepository outgoingCommitsTo: remote) ifNotEmpty: [ :commits |
+		'{1} not published' format: { commits size } ].
 	status ifEmpty: [ ^ true ].
-
-	^ SpApplication defaultApplication newConfirm 
-		title: ('{1} has ongoing modifications.' format: { aRepository name.});
-		label: ('{2} 
+
+	^ self defaultApplication newConfirm
+		  title:
+			  ('{1} has ongoing modifications.' format: { aRepository name });
+		  label: ('{2} 
 Do you want to continue anyway?' format: { status asCommaString });
-	openModal
+		  openModal
 ]

Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st

@@ -32,27 +32,30 @@ IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherS
 
 { #category : #executing }
 IceGitHubOpenOnGithubAction >> basicExecute [
-	[ 
-
+
+	[
 	| url |
-	url := (self github getRepository: self organisation project: self projectName) at: 'html_url'.
-
-	self class environment 
-		at: #WebBrowser 
-		ifPresent: [ :webBrowser | webBrowser openOn: url ] 
-		ifAbsent: [ 
-			SpApplication defaultApplication 
+	url := (self github
+		        getRepository: self organisation
+		        project: self projectName) at: 'html_url'.
+
+	self class environment
+		at: #WebBrowser
+		ifPresent: [ :webBrowser | webBrowser openOn: url ]
+		ifAbsent: [
+			self defaultApplication
 				title: ('Cannot open "{1}"' format: { url });
-				label: 'Because the project WebBrowser is not present by default in Pharo 6.';
-				openModal ] 
-
-	]
+				label:
+					'Because the project WebBrowser is not present by default in Pharo 6.';
+				openModal ] ]
 		on: IceGitHubError
-		do: [ 
-			SpApplication defaultApplication 
+		do: [
+			self defaultApplication
 				title: 'Invalid Github repository.';
-				label: ('No project named "{1}" found for the owner "{2}"' 
-								format: { self projectName . self organisation});
+				label:
+					('No project named "{1}" found for the owner "{2}"' format: {
+								 self projectName.
+								 self organisation });
 				openModal ]
 ]
 

Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st

@@ -54,18 +54,17 @@ IceGitHubRemoveBranchesAction >> remoteBranches [
 
 { #category : #actions }
 IceGitHubRemoveBranchesAction >> removeBranch: json [
+
 	| branchName |
-
 	branchName := json at: 'name'.
-	IceGitHubAPI new 
+	IceGitHubAPI new
 		credentials: self credentials;
-		deleteBranch: self remote owner 
-			project: self remote projectBasename
-			name: branchName.
-	SpApplication defaultApplication 
+		deleteBranch: self remote owner
+		project: self remote projectBasename
+		name: branchName.
+	self defaultApplication
 		title: ('Branch {1} removed.' format: { branchName });
-		openModal	
-
+		openModal
 ]
 
 { #category : #actions }

Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st

@@ -217,8 +217,8 @@ IceGitHubTipPullRequestBrowser >> mergeButton [
 { #category : #actions }
 IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [
 
-	(UIManager default confirm:
-		 ('I will create a new local branch named {1}. Should I continue?' 
+	(self confirm:
+		 ('I will create a new local branch named {1}. Should I continue?'
 			  format: { self pullRequest branchName })) ifFalse: [ ^ self ].
 
 	IceGitHubAPI ensureCredentials.

Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st

@@ -18,27 +18,30 @@ IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectNam
 
 { #category : #executing }
 IceGitHubViewPullRequestOnGithubAction >> basicExecute [
-	[ 
-
+
+	[
 	| url |
-	url := (self github getRepository: self organisation project: self projectName) at: 'html_url'.
-
-	self class environment 
-		at: #WebBrowser 
-		ifPresent: [ :webBrowser | webBrowser openOn: url ] 
-		ifAbsent: [ 
-			SpApplication defaultApplication newInform 
-				title: ('Cannot open "{1}"' format: { url }); 
-				label: 'Because the project WebBrowser is not present by default in Pharo 6.';
-				openModal  ] 
-
-	]
+	url := (self github
+		        getRepository: self organisation
+		        project: self projectName) at: 'html_url'.
+
+	self class environment
+		at: #WebBrowser
+		ifPresent: [ :webBrowser | webBrowser openOn: url ]
+		ifAbsent: [
+			self defaultApplication newInform
+				title: ('Cannot open "{1}"' format: { url });
+				label:
+					'Because the project WebBrowser is not present by default in Pharo 6.';
+				openModal ] ]
 		on: IceGitHubError
-		do: [ 
-			SpApplication defaultApplication newInform 
+		do: [
+			SpApplication defaultApplication newInform
 				title: 'Invalid Github repository.';
-				label: ('No project named "{1}" found for the owner "{2}"' 
-								format: { self projectName . self organisation});
+				label:
+					('No project named "{1}" found for the owner "{2}"' format: {
+								 self projectName.
+								 self organisation });
 				openModal ]
 ]
 

Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st

@@ -17,15 +17,16 @@ IceTipMetacelloInstallBaselineGroupCommand class >> defaultName [
 IceTipMetacelloInstallBaselineGroupCommand >> execute [
 
 	| result |
-	result := UIManager default 
-		request: 'Groups to install (a comma separated string)' 
-		initialAnswer: '' 
-		title: 'Enter groups to install'.
-	result ifNil: [ ^ self ].
-	
-	self 
+	result := self application newRequest
+		          title: 'Enter groups to install';
+		          label: 'Groups to install (a comma separated string)';
+		          text: 'All'; openModal.
+	 result ifNil: [ ^ self ].
+
+	self
 		installBaseline: self package
-		groups: ((result substrings: ',') 
-			collect: #trimmed 
-			as: Array)
+		groups:
+		((result substrings: ',')
+			 collect: [ :each | each trimmed ]
+			 as: Array)
 ]

Iceberg-Tests/IceParameterizedTestCase.class.st

@@ -135,12 +135,15 @@ IceParameterizedTestCase >> printOn: aStream [
 
 { #category : #running }
 IceParameterizedTestCase >> setUp [
+
 	super setUp.
-	oldShareRepositoriesBetweenImages := IceLibgitRepository shareRepositoriesBetweenImages.
+	oldShareRepositoriesBetweenImages := IceLibgitRepository
+		                                     shareRepositoriesBetweenImages.
 	IceLibgitRepository shareRepositoriesBetweenImages: false.
 	provider := IceCredentialsProvider providerType.
-	IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider.
-	self parameters do: #activate.
+	IceCredentialsProvider providerType:
+		IceNonInteractiveCredentialsProvider.
+	self parameters do: [ :each | each activate ]
 ]
 
 { #category : #running }

Iceberg-TipUI/IceTipEditProjectDialog.class.st

@@ -332,21 +332,18 @@ IceTipEditProjectDialog >> onAccept: aBlockClosure [
 IceTipEditProjectDialog >> removeDirectory [
 
 	| toRemove newSelection |
-
 	newSelection := selectedDirectoryPath parent.
 	toRemove := selectedDirectoryPath asResolvedBy: self model fileSystem.
 
-	toRemove exists 
-		ifTrue: [ 
-			(UIManager default 
-				questionWithoutCancel: ('Are you sure to delete ''{1}''?' format: {toRemove basename})  
-				title: 'Remove directory')
-				ifFalse: [ ^ self].
-			toRemove ensureDelete ].
-
-	sourceDirectoryTree roots: { self model fileSystem }.
-	self expandAndSelect: newSelection.
+	toRemove exists ifTrue: [
+		(self application newConfirm
+			 title: 'Remove directory';
+			 label: ('Are you sure to delete ''{1}''?' format: { toRemove basename });
+			 openModal) ifFalse: [ ^ self ].
+		toRemove ensureDelete ].
 
+	sourceDirectoryTree roots: { self model fileSystem }.
+	self expandAndSelect: newSelection
 ]
 
 { #category : #accessing }

Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st

@@ -56,8 +56,10 @@ IceTipFetchAllProjectCommand >> iconName [
 { #category : #executing }
 IceTipFetchAllProjectCommand >> isConfirmed [
 
-	^ UIManager default
-		  confirm:
-		  'This operation can take some times depending on the size and number of your repositories. Are you sure you want to fetch all repositories?'
-		  label: 'Proceed?'
+	^ self application newConfirm
+		  	title: 'Proceed?';
+			label: 
+		  'This operation can take some times depending on the size and number of your repositories. Are you sure you want to fetch all repositories?';
+			openModal 
+
 ]