[feenkcom/gtoolkit#3758] renaming package tags in coder

feenkcom · Jul 17, 2024 · 0745a7b · 0745a7b
1 parent 6c14a57
commit 0745a7b
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 89 deletions.
diff --git a/src/GToolkit-Pharo-Coder-UI/GtPharoPackageCoderElement.class.st b/src/GToolkit-Pharo-Coder-UI/GtPharoPackageCoderElement.class.st
@@ -62,7 +62,7 @@ GtPharoPackageCoderElement >> buildPackageLabel [
 						to: packageNameEditor text asString} ];
 			cancelBlock: [ packageNameEditor text: packageCoder package name ];
 			when: GtRefactoringsAppliedEvent
-				do: [ :anEvent | anEvent currentTarget visibility: BlVisibility hidden ].
+				do: [ :anEvent | anEvent currentTarget visibility: BlVisibility gone ].
 
 	packageNameEditor editor
 		when: BrTextEditorModifiedEvent

diff --git a/src/GToolkit-Pharo-Coder-UI/GtPharoPackageTagCoderElement.class.st b/src/GToolkit-Pharo-Coder-UI/GtPharoPackageTagCoderElement.class.st
@@ -31,41 +31,44 @@ GtPharoPackageTagCoderElement >> buildContentTabs [
 { #category : #'build ui' }
 GtPharoPackageTagCoderElement >> buildPackageTagLabel [
 	| tagNameEditor container previewButton unloadButton |
-
 	container := BrHorizontalPane new
-		hMatchParent;
-		alignCenterLeft;
-		vFitContent.
-	
+			hMatchParent;
+			alignCenterLeft;
+			vFitContent.
+
 	tagNameEditor := BrEditableLabel new
-		aptitude: (BrGlamorousEditableLabelAptitude new
-			defaultBackground: Color transparent;
-			glamorousCodeFont;
-			bold;
-			fontSize: 18);
-		inputFilter: BrTextEditorAlphaNumericInputFilter new;
-		text: packageTagCoder packageTag name;
-		margin: (BlInsets all: 0).
+			aptitude: (BrGlamorousEditableLabelAptitude new
+					defaultBackground: Color transparent;
+					glamorousCodeFont;
+					bold;
+					fontSize: 18);
+			inputFilter: BrTextEditorAlphaNumericInputFilter new;
+			text: packageTagCoder packageTag name;
+			margin: (BlInsets all: 0).
 
 	previewButton := GtRefactoringsPreviewButton new
-		margin: (BlInsets left: 5);
-		visibility: BlVisibility gone;
-		refactorings: [ { GtRBRenamePackageTagRefactoring packageName: packageTagCoder package name from: packageTagCoder packageTag gtTagName to: tagNameEditor text asString } ];
-		cancelBlock: [ tagNameEditor text: packageTagCoder packageTag name];
-		when: GtRefactoringsAppliedEvent do: [ :anEvent | anEvent currentTarget visibility: BlVisibility hidden ].
-
+			margin: (BlInsets left: 5);
+			visibility: BlVisibility gone;
+			refactorings: [ {GtRBRenamePackageTagRefactoring
+						packageName: packageTagCoder package name
+						from: packageTagCoder packageTag gtTagName
+						to: tagNameEditor text asString} ];
+			cancelBlock: [ tagNameEditor text: packageTagCoder packageTag name ];
+			when: GtRefactoringsAppliedEvent
+				do: [ :anEvent | anEvent currentTarget visibility: BlVisibility gone ].
+
 	tagNameEditor editor
-		when: BrTextEditorModifiedEvent 
-		do: [ :anEvent |
+		when: BrTextEditorModifiedEvent
+		do: [ :anEvent | 
 			anEvent text asString = packageTagCoder packageTag name
 				ifTrue: [ previewButton visibility: BlVisibility gone ]
-				ifFalse: [  previewButton visibility: BlVisibility visible ] ].
+				ifFalse: [ previewButton visibility: BlVisibility visible ] ].
 
 	unloadButton := GtPreviewChangeButton new
-		icon: BrGlamorousVectorIcons remove;
-		label: 'Unload';
-		changeAction: [ self unloadPackageTag ];
-		changeStencil: [ self buildRemovePackageTagLabel ].
+			icon: BrGlamorousVectorIcons remove;
+			label: 'Unload';
+			changeAction: [ self unloadPackageTag ];
+			changeStencil: [ self buildRemovePackageTagLabel ].
 
 	container addChild: tagNameEditor.
 	container addChild: previewButton.

diff --git a/src/GToolkit-Pharo-Coder/GtClassMethodsCoder.class.st b/src/GToolkit-Pharo-Coder/GtClassMethodsCoder.class.st
@@ -42,6 +42,11 @@ GtClassMethodsCoder >> addNewCoder [
 	^ aCoder
 ]
 
+{ #category : #accessing }
+GtClassMethodsCoder >> classOrMetaClass [
+	^ class
+]
+
 { #category : #private }
 GtClassMethodsCoder >> classesFilter [
 	| filter |
@@ -56,11 +61,6 @@ GtClassMethodsCoder >> classesFilter [
 	^ filter
 ]
 
-{ #category : #accessing }
-GtClassMethodsCoder >> classOrMetaClass [
-	^ class
-]
-
 { #category : #accessing }
 GtClassMethodsCoder >> codeGeneratorsAvailableFor: aMethodsCoderViewModel [
 	^ (self codeGeneratorsFor: aMethodsCoderViewModel) size > 0
@@ -85,11 +85,6 @@ GtClassMethodsCoder >> combinedFilter [
 			[ :filter | combined ifNil: [ filter ] ifNotNil: [ filter & combined ] ]
 ]
 
-{ #category : #testing }
-GtClassMethodsCoder >> filteredClass: aBehavior [
-	^ filteredClasses includes: aBehavior
-]
-
 { #category : #elements }
 GtClassMethodsCoder >> filterTypes [
 	^ GtPhlowViewsCollector new
@@ -98,6 +93,11 @@ GtClassMethodsCoder >> filterTypes [
 		collect
 ]
 
+{ #category : #testing }
+GtClassMethodsCoder >> filteredClass: aBehavior [
+	^ filteredClasses includes: aBehavior
+]
+
 { #category : #initialize }
 GtClassMethodsCoder >> forClass: aBehavior [
 	class := aBehavior.

diff --git a/src/GToolkit-Pharo-Coder/GtCoderNavigationPackagesTagsClassesModel.class.st b/src/GToolkit-Pharo-Coder/GtCoderNavigationPackagesTagsClassesModel.class.st
@@ -34,18 +34,6 @@ GtCoderNavigationPackagesTagsClassesModel >> classAdded: aClassAdded [
 		theClass: aClassAdded classAdded)
 ]
 
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> classesToShow [
-	<return: #Collection of: #Class>
-
-	self hasSelectedPackage
-		ifFalse: [ ^ #() ].
-
-	^ self hasSelectedTag
-		ifTrue: [ self selectedTag classes ]
-		ifFalse: [ self selectedPackage definedClasses ]
-]
-
 { #category : #'event handling' }
 GtCoderNavigationPackagesTagsClassesModel >> classModificationApplied: anAnnouncement [
 	(self packagesToShow includes: anAnnouncement packageAffected) ifFalse: [ ^ self ].
@@ -80,6 +68,18 @@ GtCoderNavigationPackagesTagsClassesModel >> classRenamed: aClassRenamed [
 		newName: aClassRenamed newName)
 ]
 
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> classesToShow [
+	<return: #Collection of: #Class>
+
+	self hasSelectedPackage
+		ifFalse: [ ^ #() ].
+
+	^ self hasSelectedTag
+		ifTrue: [ self selectedTag classes ]
+		ifFalse: [ self selectedPackage definedClasses ]
+]
+
 { #category : #'private - accessing' }
 GtCoderNavigationPackagesTagsClassesModel >> coder: aCoder [
 	coder == aCoder ifTrue: [ ^ self ].
@@ -211,13 +211,6 @@ GtCoderNavigationPackagesTagsClassesModel >> packageRenamed: aRPackageRenamed [
 		newName: aRPackageRenamed newName)
 ]
 
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> packagesToShow [
-	<return: #Collection of: #RPackage>
-
-	^ RPackageOrganizer default gtSortedPackages
-]
-
 { #category : #'event handling' }
 GtCoderNavigationPackagesTagsClassesModel >> packageTagAdded: aClassTagAdded [
 	(self packagesToShow includes: aClassTagAdded package) ifFalse: [ ^ self ].
@@ -236,13 +229,31 @@ GtCoderNavigationPackagesTagsClassesModel >> packageTagRemoved: aClassTagRemoved
 		tag: aClassTagRemoved tag)
 ]
 
+{ #category : #'event handling' }
+GtCoderNavigationPackagesTagsClassesModel >> packageTagRenamed: aClassTagRenamed [
+	(self packagesToShow includes: aClassTagRenamed package) ifFalse: [ ^ self ].
+	self announcer
+		announce: (GtCoderNavigationPackageTagRenamed new
+				coder: coder;
+				package: aClassTagRenamed package;
+				oldName: aClassTagRenamed tag;
+				newName: aClassTagRenamed newName)
+]
+
 { #category : #'event handling' }
 GtCoderNavigationPackagesTagsClassesModel >> packageUnregistered: aRPackageUnregistered [
 	self announcer announce: (GtCoderNavigationPackageUnregistered new 
 		coder: coder;
 		package: aRPackageUnregistered package)
 ]
 
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> packagesToShow [
+	<return: #Collection of: #RPackage>
+
+	^ RPackageOrganizer default gtSortedPackages
+]
+
 { #category : #'api - selection' }
 GtCoderNavigationPackagesTagsClassesModel >> selectClass: aClass [
 	| aCoder newPackage |
@@ -301,39 +312,6 @@ GtCoderNavigationPackagesTagsClassesModel >> selectCoder: aCoder [
 	self notifyCoderSelected
 ]
 
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedClass [
-	<return: #Class>
-	^ coder theClass
-]
-
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedClassDo: aBlock [
-	self selectedClass ifNotNil: aBlock
-]
-
-{ #category : #'api - selection' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedPackage [
-	<return: #RPackage>
-	^ selectedPackage
-]
-
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedPackageDo: aBlock [
-	self selectedPackage ifNotNil: aBlock
-]
-
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedTag [
-	<return: #RPackageTag>
-	^ selectedTag
-]
-
-{ #category : #'api - accessing' }
-GtCoderNavigationPackagesTagsClassesModel >> selectedTagDo: aBlock [
-	self selectedTag ifNotNil: aBlock
-]
-
 { #category : #'api - selection' }
 GtCoderNavigationPackagesTagsClassesModel >> selectMethod: aMethod [
 	self selectClass: aMethod methodClass instanceSide.
@@ -384,6 +362,39 @@ GtCoderNavigationPackagesTagsClassesModel >> selectSlot: aSlot source: aSource [
 	self notifySlotSelected: aSlot source: aSource
 ]
 
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedClass [
+	<return: #Class>
+	^ coder theClass
+]
+
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedClassDo: aBlock [
+	self selectedClass ifNotNil: aBlock
+]
+
+{ #category : #'api - selection' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedPackage [
+	<return: #RPackage>
+	^ selectedPackage
+]
+
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedPackageDo: aBlock [
+	self selectedPackage ifNotNil: aBlock
+]
+
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedTag [
+	<return: #RPackageTag>
+	^ selectedTag
+]
+
+{ #category : #'api - accessing' }
+GtCoderNavigationPackagesTagsClassesModel >> selectedTagDo: aBlock [
+	self selectedTag ifNotNil: aBlock
+]
+
 { #category : #'api - selection' }
 GtCoderNavigationPackagesTagsClassesModel >> showPackage: anRPackage [
 	^ true
@@ -395,6 +406,7 @@ GtCoderNavigationPackagesTagsClassesModel >> subscribeToSystem [
 		when: RPackageRegistered send: #packageRegistered: to: self;
 		when: RPackageUnregistered send: #packageUnregistered: to: self;
 		when: RPackageRenamed send: #packageRenamed: to: self;
+		when: ClassTagAnnouncement send: #packageTagRenamed: to: self;
 		when: ClassTagAdded send: #packageTagAdded: to: self;
 		when: ClassTagRemoved send: #packageTagRemoved: to: self;
 		when: ClassAdded send: #classAdded: to: self;