Merge pull request #14940 from Ducasse/2023-10-09-CleanRemoveShared

- Continue to migrate RBCondition to RBNewAbstractCondition subclasses

src/Refactoring-Core/RBClassCondition.class.st

@@ -0,0 +1,32 @@
+Class {
+	#name : 'RBClassCondition',
+	#superclass : 'RBClassNameCondition',
+	#instVars : [
+		'aClass'
+	],
+	#category : 'Refactoring-Core-Conditions',
+	#package : 'Refactoring-Core',
+	#tag : 'Conditions'
+}
+
+{ #category : 'instance creation' }
+RBClassCondition class >> class: anRBClass [ 
+	^ self new
+		class: anRBClass;
+		yourself
+]
+
+{ #category : 'accessing' }
+RBClassCondition >> class: aRBClass [
+	aClass := aRBClass
+]
+
+{ #category : 'accessing' }
+RBClassCondition >> classNamed: aString [ 
+	aClass := model classNamed: aString
+]
+
+{ #category : 'accessing' }
+RBClassCondition >> model: aModel [ 
+	model := aModel
+]

src/Refactoring-Core/RBClassNameCondition.class.st

@@ -0,0 +1,31 @@
+Class {
+	#name : 'RBClassNameCondition',
+	#superclass : 'RBNewAbstractCondition',
+	#instVars : [
+		'violators',
+		'model',
+		'className'
+	],
+	#category : 'Refactoring-Core-Conditions',
+	#package : 'Refactoring-Core',
+	#tag : 'Conditions'
+}
+
+{ #category : 'instance creation' }
+RBClassNameCondition class >> classNamed: aString inModel: aModel [ 
+
+	^ self new
+		model: aModel;
+		classNamed: aString; 
+		yourself
+]
+
+{ #category : 'accessing' }
+RBClassNameCondition >> classNamed: aString [ 
+	className := aString
+]
+
+{ #category : 'accessing' }
+RBClassNameCondition >> model: aModel [ 
+	model := aModel
+]

src/Refactoring-Core/RBDefinesSharedVariableCondition.class.st

@@ -0,0 +1,35 @@
+Class {
+	#name : 'RBDefinesSharedVariableCondition',
+	#superclass : 'RBClassCondition',
+	#instVars : [
+		'sharedVariables'
+	],
+	#category : 'Refactoring-Core-Conditions',
+	#package : 'Refactoring-Core',
+	#tag : 'Conditions'
+}
+
+{ #category : 'instance creation' }
+RBDefinesSharedVariableCondition class >> class: aRBClass sharedVariables: aCollection [ 
+	^ self new class: aRBClass; sharedVariables: aCollection ; yourself
+]
+
+{ #category : 'instance creation' }
+RBDefinesSharedVariableCondition class >> classNamed: aString inModel: aRBNamespace sharedVariables: aCollection [ 
+
+	^ (self classNamed: aString inModel: aRBNamespace)
+		sharedVariables: aCollection;
+		yourself
+]
+
+{ #category : 'accessing' }
+RBDefinesSharedVariableCondition >> check [
+
+	violators := sharedVariables reject: [ :shared | aClass definesClassVariable: shared ].
+	^ violators isEmpty
+]
+
+{ #category : 'accessing' }
+RBDefinesSharedVariableCondition >> sharedVariables: aCollection [ 
+	sharedVariables := aCollection
+]

src/Refactoring-Core/RBIsClassDefined.class.st

@@ -0,0 +1,19 @@
+Class {
+	#name : 'RBIsClassDefined',
+	#superclass : 'RBClassNameCondition',
+	#category : 'Refactoring-Core-Conditions',
+	#package : 'Refactoring-Core',
+	#tag : 'Conditions'
+}
+
+{ #category : 'checking' }
+RBIsClassDefined >> check [ 
+
+	^ (model classNamed: className) isNotNil
+]
+
+{ #category : 'accessing' }
+RBIsClassDefined >> violators [ 
+
+	^ { className }
+]

src/Refactoring-Core/RBIsNotAMetaclass.class.st

@@ -0,0 +1,17 @@
+Class {
+	#name : 'RBIsNotAMetaclass',
+	#superclass : 'RBClassCondition',
+	#category : 'Refactoring-Core-Conditions',
+	#package : 'Refactoring-Core',
+	#tag : 'Conditions'
+}
+
+{ #category : 'checking' }
+RBIsNotAMetaclass >> check [
+	^ aClass isMeta not
+]
+
+{ #category : 'checking' }
+RBIsNotAMetaclass >> violators [
+	^ { aClass }
+]

src/Refactoring-Core/RBNewNegationCondition.class.st

@@ -32,6 +32,6 @@ RBNewNegationCondition >> errorString [
 
 { #category : 'accessing' }
 RBNewNegationCondition >> violators [
-
+	"This is probably wrong because of the negation"
 	^ condition violators
 ]

src/Refactoring-Core/RBRemoveSharedVariableRefactoring.class.st

@@ -24,8 +24,8 @@ RBRemoveSharedVariableRefactoring class >> remove: variable from: class [
 { #category : 'preconditions' }
 RBRemoveSharedVariableRefactoring >> applicabilityPreconditions [
 
-	^ ( RBCondition isMetaclass: class ) not
-		& ( RBCondition definesClassVariable: variableName in: class )
+	^ ( RBIsNotAMetaclass class: class )
+		& ( RBDefinesSharedVariableCondition class: class sharedVariables: {variableName} )
 
 ]
 

src/Refactoring-Core/RBUpFrontPreconditionCheckingCompositeRefactoring.class.st

@@ -34,7 +34,9 @@ RBUpFrontPreconditionCheckingCompositeRefactoring >> breakingChangePreconditions
 
 	refactorings ifEmpty: [ ^ self ].
 	refactorings size = 1 ifTrue: [ ^ refactorings first breakingChangePreconditions ].
-	^ refactorings inject: RBTrueCondition new into: [ :sum :each | sum & each applicabilityPreconditions ]
+	^ refactorings allButFirst 
+		inject: refactorings first breakingChangePreconditions 
+		into: [ :sum :each | sum & each applicabilityPreconditions ]
 ]
 
 { #category : 'preconditions' }