Fix dependencies error, rename classes

pharo-project · Jul 26, 2021 · a88c04f · a88c04f
1 parent 0cf420a
commit a88c04f
Show file tree

Hide file tree

Showing 63 changed files with 383 additions and 311 deletions.
diff --git a/src/Calypso-SystemQueries/SycRemoveClassStrategy.extension.st b/src/Calypso-SystemQueries/SycRemoveClassStrategy.extension.st
@@ -0,0 +1,24 @@
+Extension { #name : #SycRemoveClassStrategy }
+
+{ #category : #'*Calypso-SystemQueries' }
+SycRemoveClassStrategy class >> createForBrowser: aBrowser classes: aCollection [
+
+	| hasReferences hasSubclasses hasUsers |
+	hasReferences := (ClyClassExternalReferencesQuery
+		                  toAny: aCollection
+		                  from: aBrowser systemScope) execute notEmpty.
+	hasSubclasses := ((aCollection flatCollect: [ :each | 
+		                   each subclasses ]) copyWithoutAll: aCollection)
+		                 notEmpty.
+	hasUsers := ((aCollection flatCollect: [ :each | each users ]) 
+		             copyWithoutAll: aCollection) notEmpty.
+
+	hasReferences | hasSubclasses | hasUsers ifFalse: [ 
+		^ { SycSilentlyRemoveClassStrategy new } ].
+
+	^ self
+		  createForBrowser: aBrowser
+		  references: hasReferences
+		  subclasses: hasSubclasses
+		  users: hasUsers
+]
diff --git a/src/Calypso-SystemTools-Core/SycAbstractAllInstVarAccessorsCommand.extension.st b/src/Calypso-SystemTools-Core/SycAbstractAllInstVarAccessorsCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycAbstractAllInstVarAccessorsCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycAbstractAllInstVarAccessorsCommand class >> browserShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation  by: $a meta, $a meta for: ClyClass asCalypsoItemContext 
+]
diff --git a/.../ClyAddHierarchyScopeCommand.extension.st → .../SycAddHierarchyScopeCommand.extension.st b/.../ClyAddHierarchyScopeCommand.extension.st → .../SycAddHierarchyScopeCommand.extension.st
@@ -1,14 +1,14 @@
-Extension { #name : #ClyAddHierarchyScopeCommand }
+Extension { #name : #SycAddHierarchyScopeCommand }
 
 { #category : #'*Calypso-SystemTools-Core' }
-ClyAddHierarchyScopeCommand class >> browserContextMenuActivation [
+SycAddHierarchyScopeCommand class >> browserContextMenuActivation [
 	<classAnnotation>
 
 	^ CmdContextMenuActivation byRootGroupItemOrder: 1.5 for: ClyClass asCalypsoItemContext
 ]
 
 { #category : #'*Calypso-SystemTools-Core' }
-ClyAddHierarchyScopeCommand class >> sourceCodeMenuActivation [
+SycAddHierarchyScopeCommand class >> sourceCodeMenuActivation [
 	<classAnnotation>
 
 	^ SycSourceCodeMenuActivation byRootGroupItemOrder: 1.2 for: ClySourceCodeContext

diff --git a/src/Calypso-SystemTools-Core/SycAddMessageArgumentCommand.extension.st b/src/Calypso-SystemTools-Core/SycAddMessageArgumentCommand.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SycAddMessageArgumentCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycAddMessageArgumentCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation
+		byRootGroupItemOrder: 30 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycDeprecateClassCommand.extension.st b/src/Calypso-SystemTools-Core/SycDeprecateClassCommand.extension.st
@@ -0,0 +1,17 @@
+Extension { #name : #SycDeprecateClassCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycDeprecateClassCommand class >> browserContextMenuActivation [
+	"disabled for now, see https://github.com/pharo-project/pharo/issues/9551"
+	"<classAnnotation>"
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 1.4 for: ClyClass asCalypsoItemContext  
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycDeprecateClassCommand class >> sourceCodeMenuActivation [
+	"disabled for now, see https://github.com/pharo-project/pharo/issues/9551"
+	"<classAnnotation>"
+
+	^SycSourceCodeMenuActivation byRootGroupItemOrder: 1.3 for: ClySourceCodeContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycDeprecateMessageCommand.extension.st b/src/Calypso-SystemTools-Core/SycDeprecateMessageCommand.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SycDeprecateMessageCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycDeprecateMessageCommand class >> methodMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation 
+		byRootGroupItemOrder: self browserMenuOrder for: ClyMethod asCalypsoItemContext 
+]
diff --git a/src/Calypso-SystemTools-Core/SycFindAndReplaceMethodCommand.extension.st b/src/Calypso-SystemTools-Core/SycFindAndReplaceMethodCommand.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SycFindAndReplaceMethodCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycFindAndReplaceMethodCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation
+		byRootGroupItemOrder: 25 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycGenerateAllInstVarAccessorsCommand.extension.st b/src/Calypso-SystemTools-Core/SycGenerateAllInstVarAccessorsCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycGenerateAllInstVarAccessorsCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycGenerateAllInstVarAccessorsCommand class >> browserShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation  by: $g meta, $a meta for: ClyClass asCalypsoItemContext 
+]
diff --git a/src/Calypso-SystemTools-Core/SycInlineAllSendersMessageCommand.extension.st b/src/Calypso-SystemTools-Core/SycInlineAllSendersMessageCommand.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SycInlineAllSendersMessageCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycInlineAllSendersMessageCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation
+		byRootGroupItemOrder: 35 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMigrateReferencesOfClassCommand.extension.st b/src/Calypso-SystemTools-Core/SycMigrateReferencesOfClassCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycMigrateReferencesOfClassCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMigrateReferencesOfClassCommand class >> sourceCodeMenuActivation [
+	<classAnnotation>
+
+	^SycSourceCodeMenuActivation byRootGroupItemOrder: 1.3 for: ClySourceCodeContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMoveMethodsToClassCommand.extension.st b/src/Calypso-SystemTools-Core/SycMoveMethodsToClassCommand.extension.st
@@ -7,3 +7,10 @@ SycMoveMethodsToClassCommand class >> methodBrowserDragAndDropActivation [
 	^CmdDragAndDropActivation 
 		for: ClyMethod asCalypsoItemContext toDropIn: ClyClass asCalypsoItemContext
 ]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToClassCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 60 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMoveMethodsToClassSideCommand.extension.st b/src/Calypso-SystemTools-Core/SycMoveMethodsToClassSideCommand.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #SycMoveMethodsToClassSideCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToClassSideCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 50 for: ClyMethod asCalypsoItemContext
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToClassSideCommand class >> methodShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $t meta, $c meta for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMoveMethodsToInstanceSideCommand.extension.st b/src/Calypso-SystemTools-Core/SycMoveMethodsToInstanceSideCommand.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #SycMoveMethodsToInstanceSideCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToInstanceSideCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 50 for: ClyMethod asCalypsoItemContext
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToInstanceSideCommand class >> methodShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $t meta, $i meta for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMoveMethodsToPackageCommand.extension.st b/src/Calypso-SystemTools-Core/SycMoveMethodsToPackageCommand.extension.st
@@ -8,3 +8,10 @@ SycMoveMethodsToPackageCommand class >> methodBrowserDragAndDropActivation [
 		for: ClyMethod asCalypsoItemContext 
 		toDropIn: RPackage asCalypsoItemContext
 ]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToPackageCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 70 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycMoveMethodsToPackageDefiningClassCommand.extension.st b/src/Calypso-SystemTools-Core/SycMoveMethodsToPackageDefiningClassCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycMoveMethodsToPackageDefiningClassCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycMoveMethodsToPackageDefiningClassCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 80 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycOpenClassMenuCommand.extension.st b/src/Calypso-SystemTools-Core/SycOpenClassMenuCommand.extension.st
@@ -0,0 +1,16 @@
+Extension { #name : #SycOpenClassMenuCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycOpenClassMenuCommand class >> fullBrowserMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 10100 
+		for: ClyClass asCalypsoItemContext 
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycOpenClassMenuCommand class >> fullBrowserShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $t meta for: ClyClass asCalypsoItemContext 
+]
diff --git a/src/Calypso-SystemTools-Core/SycOpenMethodMenuCommand.extension.st b/src/Calypso-SystemTools-Core/SycOpenMethodMenuCommand.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #SycOpenMethodMenuCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycOpenMethodMenuCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 10100 for: ClyMethod asCalypsoItemContext
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycOpenMethodMenuCommand class >> methodEditorShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $t meta for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycPushDownMethodCommand.extension.st b/src/Calypso-SystemTools-Core/SycPushDownMethodCommand.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #SycPushDownMethodCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycPushDownMethodCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 20 for: ClyMethod asCalypsoItemContext
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycPushDownMethodCommand class >> methodShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $p meta, $d meta for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycPushDownMethodInSomeClassesCommand.extension.st b/src/Calypso-SystemTools-Core/SycPushDownMethodInSomeClassesCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycPushDownMethodInSomeClassesCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycPushDownMethodInSomeClassesCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 21 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycPushUpMethodCommand.extension.st b/src/Calypso-SystemTools-Core/SycPushUpMethodCommand.extension.st
@@ -0,0 +1,15 @@
+Extension { #name : #SycPushUpMethodCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycPushUpMethodCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 10 for: ClyMethod asCalypsoItemContext
+]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycPushUpMethodCommand class >> methodShortcutActivation [
+	<classAnnotation>
+
+	^CmdShortcutActivation by: $p meta, $u meta for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycRemoveAllSendersCommand.extension.st b/src/Calypso-SystemTools-Core/SycRemoveAllSendersCommand.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #SycRemoveAllSendersCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycRemoveAllSendersCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation
+		byRootGroupItemOrder: 35 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycRemoveHierarchyMethodCommand.extension.st b/src/Calypso-SystemTools-Core/SycRemoveHierarchyMethodCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycRemoveHierarchyMethodCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycRemoveHierarchyMethodCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 100 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycRemoveMessageArgumentCommand.extension.st b/src/Calypso-SystemTools-Core/SycRemoveMessageArgumentCommand.extension.st
@@ -4,3 +4,10 @@ Extension { #name : #SycRemoveMessageArgumentCommand }
 SycRemoveMessageArgumentCommand class >> browserMenuOrder [
 	^2.2
 ]
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycRemoveMessageArgumentCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 40 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-Core/SycReplaceMessageCommand.extension.st b/src/Calypso-SystemTools-Core/SycReplaceMessageCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycReplaceMessageCommand }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+SycReplaceMessageCommand class >> methodContextMenuActivation [
+	<classAnnotation>
+
+	^ SycMethodMenuActivation byRootGroupItemOrder: 1100 for: ClyMethod asCalypsoItemContext
+]
diff --git a/src/Calypso-SystemTools-FullBrowser/ClyAddProtocolScopeCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/ClyAddProtocolScopeCommand.extension.st
diff --git a/src/Calypso-SystemTools-FullBrowser/SycAbstractAllInstVarAccessorsCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/SycAbstractAllInstVarAccessorsCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycAbstractAllInstVarAccessorsCommand }
+
+{ #category : #'*Calypso-SystemTools-FullBrowser' }
+SycAbstractAllInstVarAccessorsCommand class >> fullBrowserMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 2.1 for: ClyFullBrowserClassContext 
+]
diff --git a/...er/ClyAddClassesScopeCommand.extension.st → ...er/SycAddClassesScopeCommand.extension.st b/...er/ClyAddClassesScopeCommand.extension.st → ...er/SycAddClassesScopeCommand.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyAddClassesScopeCommand }
+Extension { #name : #SycAddClassesScopeCommand }
 
 { #category : #'*Calypso-SystemTools-FullBrowser' }
-ClyAddClassesScopeCommand class >> browserContextMenuActivation [
+SycAddClassesScopeCommand class >> browserContextMenuActivation [
 	<classAnnotation>
 
 	^ CmdContextMenuActivation byRootGroupItemOrder: 1.5 for: ClyClass asCalypsoItemContext

diff --git a/...r/ClyAddPackagesScopeCommand.extension.st → ...r/SycAddPackagesScopeCommand.extension.st b/...r/ClyAddPackagesScopeCommand.extension.st → ...r/SycAddPackagesScopeCommand.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyAddPackagesScopeCommand }
+Extension { #name : #SycAddPackagesScopeCommand }
 
 { #category : #'*Calypso-SystemTools-FullBrowser' }
-ClyAddPackagesScopeCommand class >> fullBrowserMenuActivation [
+SycAddPackagesScopeCommand class >> fullBrowserMenuActivation [
 	<classAnnotation>
 
 	^ CmdContextMenuActivation byRootGroupItemFor: ClyFullBrowserPackageContext 

diff --git a/src/Calypso-SystemTools-FullBrowser/SycMigrateReferencesOfClassCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/SycMigrateReferencesOfClassCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycMigrateReferencesOfClassCommand }
+
+{ #category : #'*Calypso-SystemTools-FullBrowser' }
+SycMigrateReferencesOfClassCommand class >> fullBrowserMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 1.4 for: ClyFullBrowserClassContext 
+]
diff --git a/src/Calypso-SystemTools-FullBrowser/SycOpenClassMenuCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/SycOpenClassMenuCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycOpenClassMenuCommand }
+
+{ #category : #'*Calypso-SystemTools-FullBrowser' }
+SycOpenClassMenuCommand class >> fullBrowserTabActivation [
+	<classAnnotation>
+
+	^ClyBrowserTabCommandActivation for: ClyFullBrowserClassContext 
+]
diff --git a/src/Calypso-SystemTools-FullBrowser/SycOpenProtocolMenuCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/SycOpenProtocolMenuCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycOpenProtocolMenuCommand }
+
+{ #category : #'*Calypso-SystemTools-FullBrowser' }
+SycOpenProtocolMenuCommand class >> fullBrowserMethodGroupMenuActivation [
+	<classAnnotation>
+
+	^ CmdContextMenuActivation byRootGroupItemOrder: 10002 for: ClyFullBrowserMethodGroupContext 
+]
diff --git a/src/Calypso-SystemTools-FullBrowser/SycRealizeClassCommand.extension.st b/src/Calypso-SystemTools-FullBrowser/SycRealizeClassCommand.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #SycRealizeClassCommand }
+
+{ #category : #'*Calypso-SystemTools-FullBrowser' }
+SycRealizeClassCommand class >> fullBrowserMenuActivation [
+	<classAnnotation>
+
+	^CmdContextMenuActivation byRootGroupItemOrder: 2.1 for: ClyFullBrowserClassContext 
+]
diff --git a/src/SystemCommands-ClassCommands/SycAbstractAllInstVarAccessorsCommand.class.st b/src/SystemCommands-ClassCommands/SycAbstractAllInstVarAccessorsCommand.class.st
@@ -7,20 +7,6 @@ Class {
 	#category : #'SystemCommands-ClassCommands'
 }
 
-{ #category : #activation }
-SycAbstractAllInstVarAccessorsCommand class >> browserShortcutActivation [
-	<classAnnotation>
-
-	^CmdShortcutActivation  by: $a meta, $a meta for: ClyClass asCalypsoItemContext 
-]
-
-{ #category : #activation }
-SycAbstractAllInstVarAccessorsCommand class >> fullBrowserMenuActivation [
-	<classAnnotation>
-
-	^CmdContextMenuActivation byRootGroupItemOrder: 2.1 for: ClyFullBrowserClassContext 
-]
-
 { #category : #accessing }
 SycAbstractAllInstVarAccessorsCommand >> asRefactorings [
 	| refactorings env |