Merge pull request #1808 from Rinzwind/icetiptreenode-formset

Refactor IceTipTreeNode to support use of a FormSet
pharo-vcs · Mar 20, 2024 · cb4e166 · cb4e166
2 parents 39618b7 + 8c58afb
commit cb4e166
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st
@@ -392,15 +392,15 @@ IceTipRepositoryModel >> repositoryModelsByGroup [
 	^ {
 		  ((IceTipTreeRepositoryGroup on: self)
 			   name: 'Branches';
-			   icon: (self iconNamed: #branch);
+			   iconFormSet: (self iconFormSetNamed: #branch);
 			   children: (branches
 					    select: [ :each | each entity isLocal ]
 					    thenCollect: [ :each | IceTipTreeBranch on: each ]);
 			   yourself).
 		  "Remotes group"
 		  ((IceTipTreeRepositoryGroup on: self)
 			   name: 'Remotes';
-			   icon: (self iconNamed: #remote);
+			   iconFormSet: (self iconFormSetNamed: #remote);
 			   children: (self entity remotes collect: [ :eachRemote |
 						    | remoteModel |
 						    remoteModel := IceTipRemoteModel
@@ -418,7 +418,7 @@ IceTipRepositoryModel >> repositoryModelsByGroup [
 		  "Tags group"
 		  ((IceTipTreeRepositoryGroup on: self)
 			   name: 'Tags';
-			   icon: (self iconNamed: #glamorousBookmark);
+			   iconFormSet: (self iconFormSetNamed: #glamorousBookmark);
 			   children: (tags collect: [ :each | IceTipTreeTag on: each ]);
 			   yourself) }
 	"Branches group"

diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st
@@ -10,7 +10,7 @@ Class {
 	#instVars : [
 		'model',
 		'parent',
-		'icon'
+		'iconFormSet'
 	],
 	#category : 'Iceberg-TipUI-View-Repository',
 	#package : 'Iceberg-TipUI',
@@ -48,12 +48,17 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [
 
 { #category : 'accessing' }
 IceTipTreeNode >> icon [
-	^ icon
+	^ self iconFormSet ifNotNil: [ :formSet | formSet asForm ]
 ]
 
 { #category : 'accessing' }
-IceTipTreeNode >> icon: anIcon [
-	icon := anIcon
+IceTipTreeNode >> iconFormSet [
+	^ iconFormSet
+]
+
+{ #category : 'accessing' }
+IceTipTreeNode >> iconFormSet: aFormSet [
+	iconFormSet := aFormSet
 ]
 
 { #category : 'testing' }