Merge pull request #1772 from tesonep/adding-application-in-model

Adding application in model temporarly
pharo-vcs · Nov 29, 2023 · 2cff2ec · 2cff2ec
2 parents a557cbf + 0c4d94a
commit 2cff2ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st
@@ -30,13 +30,12 @@ IceTipDiffPreviewModel >> commitish: aCommitish [
 { #category : 'accessing' }
 IceTipDiffPreviewModel >> diff [
 
-	^ diffModel ifNil: [ | diff |
-		self application 
-			informUser: 'Calculating diff'
-			during: [ diff := self calculateDiff ].
-			diffModel := IceTipCommitDiffModel
-					repositoryModel: self repositoryModel 
-					on: diff ]
+	^ diffModel ifNil: [
+		  | diff |
+		  diff := self calculateDiff.
+		  diffModel := IceTipCommitDiffModel
+			               repositoryModel: self repositoryModel
+			               on: diff ]
 ]
 
 { #category : 'accessing' }

diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st
@@ -11,6 +11,12 @@ Class {
 	#tag : 'Model'
 }
 
+{ #category : 'accessing' }
+IceTipModel >> application [
+
+	^ StPharoApplication current
+]
+
 { #category : 'converting' }
 IceTipModel >> beCached [
 	^ IceTipCachedModel for: self

diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st
@@ -59,7 +59,9 @@ IceTipPreviewBrowser >> initialExtentForWindow [
 { #category : 'initialization' }
 IceTipPreviewBrowser >> initializePresenters [
 
-	diffPanel := self instantiate: IceTipDiffPanel on: self model diff.
+	self application 
+		informUser: 'Calculating diff'
+		during: [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff].
 	actionPanel := self newButtonBar.
 	actionPanel add: (button := self newActionButton)
 ]