Remove SycRemoveClassKeepingSubclassesCommand since we don't have any…

… more need of a specific menu item for this. The existing functionality is preserved by SycRemoveClassCommand using the SycRemoveKeepingSubclassesClassStrategy.
pharo-project · Jan 4, 2021 · 4f1be94 · 4f1be94
1 parent 3c5cc72
commit 4f1be94
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 98 deletions.
diff --git a/src/Calypso-NavigationModel/ClyConstantQuery.class.st b/src/Calypso-NavigationModel/ClyConstantQuery.class.st
@@ -70,7 +70,7 @@ ClyConstantQuery >> buildResult: aQueryResult [
 
 { #category : #execution }
 ClyConstantQuery >> checkEmptyResult [
-	^resultItems notEmpty
+	^resultItems isEmpty
 ]
 
 { #category : #execution }

diff --git a/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st b/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st
@@ -64,24 +64,6 @@ ClyBrowserMorph >> confirmUnusedClasses: classes [
 	^noUsers
 ]
 
-{ #category : #'*Calypso-SystemTools-Core' }
-ClyBrowserMorph >> confirmUnusedClassesExceptInheritance: classes [
-
-	| refQuery noUsers answer users |
-
-	refQuery := ClyClassReferencesQuery toAny: classes from: self systemScope.	
-	"we need to exclude both the class and instance side of the class"
-	noUsers := self confirmEmptySystemQuery: refQuery excluding: (classes flatCollect: [ :each | { each . each classSide } ]).
-
-	users := (classes flatCollect: [:each | each users]) copyWithoutAll: classes.
-	users ifNotEmpty: [ 
-		noUsers := false.
-		answer := UIManager default confirm: 'There are users of trait. Show them?'. 
-		answer ifTrue: [ self spawnQueryBrowserOn: (ClyConstantQuery returning: users) ]].
-
-	^noUsers
-]
-
 { #category : #'*Calypso-SystemTools-Core' }
 ClyBrowserMorph >> confirmUnusedVariables: variables [
 

diff --git a/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st b/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st
@@ -53,11 +53,6 @@ ClySystemBrowserContext >> confirmUnusedClasses: variables [
 	^tool confirmUnusedClasses: variables
 ]
 
-{ #category : #'user requests' }
-ClySystemBrowserContext >> confirmUnusedClassesExceptInheritance: variables [
-	^tool confirmUnusedClassesExceptInheritance: variables
-]
-
 { #category : #'user requests' }
 ClySystemBrowserContext >> confirmUnusedVariables: variables [
 	^tool confirmUnusedVariables: variables

diff --git a/src/SystemCommands-ClassCommands/SycRemoveClassCommand.class.st b/src/SystemCommands-ClassCommands/SycRemoveClassCommand.class.st
@@ -13,7 +13,13 @@ Class {
 { #category : #execution }
 SycRemoveClassCommand >> asRefactorings [
 
-	^{RBRemoveClassRefactoring classNames: (classes collect: [:each | each name])}
+	^self asRefactoringsOfClass: RBRemoveClassRefactoring
+]
+
+{ #category : #execution }
+SycRemoveClassCommand >> asRefactoringsOfClass: aClass [
+
+	^{aClass classNames: (classes collect: [:each | each name])}
 ]
 
 { #category : #execution }
@@ -45,6 +51,12 @@ SycRemoveClassCommand >> execute [
 	removeStrategy execute: self.
 ]
 
+{ #category : #execution }
+SycRemoveClassCommand >> executeRefactoringsAs: aClass [
+
+	(self asRefactoringsOfClass: aClass) do: [ :each | each execute ]
+]
+
 { #category : #testing }
 SycRemoveClassCommand >> isComplexRefactoring [
 	^removeStrategy isComplexRefactoring 

diff --git a/src/SystemCommands-ClassCommands/SycRemoveClassKeepingSubclassesCommand.class.st b/src/SystemCommands-ClassCommands/SycRemoveClassKeepingSubclassesCommand.class.st
diff --git a/src/SystemCommands-ClassCommands/SycRemoveKeepingSubclassesClassStrategy.class.st b/src/SystemCommands-ClassCommands/SycRemoveKeepingSubclassesClassStrategy.class.st
@@ -12,9 +12,7 @@ SycRemoveKeepingSubclassesClassStrategy class >> canExecuteWithReferences: hasRe
 { #category : #execution }
 SycRemoveKeepingSubclassesClassStrategy >> execute: aSycRemoveClassCommand [
 
-	(SycRemoveClassKeepingSubclassesCommand new)
-		classes: aSycRemoveClassCommand class;
-		executeRefactorings 
+	aSycRemoveClassCommand executeRefactoringsAs: RBRemoveClassKeepingSubclassesRefactoring
 ]
 
 { #category : #testing }