Merge pull request #1107 from jecisc/method-changes

Remove dependency from method addition and updates changes to ring

Author: jecisc

src/Famix-MetamodelBuilder-Core/FmxMBRealRingEnvironment.class.st

@@ -9,6 +9,16 @@ Class {
 	#tag : 'Implementation'
 }
 
+{ #category : 'adding' }
+FmxMBRealRingEnvironment >> addMethod: sourceCode in: aClassName classSide: aBoolean protocol: protocol [
+
+	changesToApply add: (FmxMethodAddition
+			 className: aClassName
+			 isClassSide: aBoolean
+			 sourceCode: sourceCode
+			 protocol: protocol)
+]
+
 { #category : 'accessing' }
 FmxMBRealRingEnvironment >> apply [
 
@@ -184,13 +194,13 @@ FmxMBRealRingEnvironment >> recordMethodsAdoptionsOf: realClass to: anRGClass re
 	((anRGClass localSelectors difference: generatedMethodNamesOfRealClass)
 		select: [ :selectorOfMethodToAdd | realClass ifNil: [ true ] ifNotNil: [ (realClass localSelectors includes: selectorOfMethodToAdd) not ] ]
 		thenCollect: [ :selectorOfMethodToAdd | anRGClass methodNamed: selectorOfMethodToAdd ])
-		ifNotEmpty: [ :methods | changesToApply add: (FmxMethodAdditions className: aClassName isClassSide: anRGClass isClassSide rgMethods: methods) ].
+		ifNotEmpty: [ :methods | methods do: [ :method | self addMethod: method sourceCode in: aClassName classSide: anRGClass isClassSide protocol: method protocol ] ].
 
 	"Finally, update methods needing updates"
 	((generatedMethodNamesOfRealClass intersection: anRGClass localSelectors)
 		collect: [ :selectorOfMethodToUpdate | anRGClass methodNamed: selectorOfMethodToUpdate ]
 		thenSelect: [ :method | realClass needToAdaptToMethod: method ])
-		ifNotEmpty: [ :methods | changesToApply add: (FmxMethodUpdates className: aClassName isClassSide: anRGClass isClassSide rgMethods: methods) ]
+		ifNotEmpty: [ :methods |methods do: [ :method | self addMethod: method sourceCode in: aClassName classSide: anRGClass isClassSide protocol: method protocol ] ]
 ]
 
 { #category : 'installing' }

src/Famix-MetamodelBuilder-Core/FmxMethodAddition.class.st

@@ -0,0 +1,62 @@
+"
+## Description
+
+I represent a change that would create a method to a class during a Famix generation
+
+## Examples
+
+```st
+	FmxMethodAddition className: FmxMethodAddition isClassSide: false sourceCode: 'x ^ x' protocol: 'accessing'
+```
+"
+Class {
+	#name : 'FmxMethodAddition',
+	#superclass : 'FmxLazyClassChange',
+	#instVars : [
+		'protocol',
+		'sourceCode'
+	],
+	#category : 'Famix-MetamodelBuilder-Core-Changes',
+	#package : 'Famix-MetamodelBuilder-Core',
+	#tag : 'Changes'
+}
+
+{ #category : 'class initialization' }
+FmxMethodAddition class >> className: aSymbol isClassSide: aBoolean sourceCode: aString protocol: protocol [
+
+	^ self new
+		  className: aSymbol;
+		  isClassSide: aBoolean;
+		  sourceCode: aString;
+		  protocol: protocol;
+		  yourself
+]
+
+{ #category : 'accessing' }
+FmxMethodAddition >> apply [
+
+	self realClass compile: sourceCode classified: protocol
+]
+
+{ #category : 'printing' }
+FmxMethodAddition >> printOn: aStream [
+
+	super printOn: aStream.
+
+	aStream
+		nextPutAll: '[';
+		nextPutAll: (protocol ifNil: [ 'empty' ]);
+		nextPutAll: ' - ';
+		nextPutAll: (sourceCode ifNil: [ 'empty' ]);
+		nextPutAll: ']'
+]
+
+{ #category : 'accessing' }
+FmxMethodAddition >> protocol: anObject [
+	protocol := anObject
+]
+
+{ #category : 'accessing' }
+FmxMethodAddition >> sourceCode: anObject [
+	sourceCode := anObject
+]