From 3b8916f704cf0617a224c790b8b607acd03d7b91 Mon Sep 17 00:00:00 2001 From: uNouss Date: Fri, 28 Jun 2024 11:43:16 +0200 Subject: [PATCH 1/4] Fix #784 --- .../FamixMetamodelGenerator.class.st | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st b/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st index bb22e8b8..d53beaee 100644 --- a/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st +++ b/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st @@ -336,11 +336,41 @@ FamixMetamodelGenerator >> mooseModelName [ ^ self class mooseModelName ] +{ #category : #definition } +FamixMetamodelGenerator >> newAbstractClassNamed: aClassName [ + + ^ builder newAbstractClassNamed: aClassName +] + { #category : #definition } FamixMetamodelGenerator >> newBuilder [ ^ FamixMetamodelBuilder forGenerator: self ] +{ #category : #definition } +FamixMetamodelGenerator >> newClassNamed: aClassName [ + + ^ builder newClassNamed: aClassName +] + +{ #category : #definition } +FamixMetamodelGenerator >> newClassNamed: aClassName comment: aComment [ + + ^ builder newClassNamed: aClassName comment: aComment +] + +{ #category : #definition } +FamixMetamodelGenerator >> newTraitNamed: aTraitName [ + + ^ builder newTraitNamed: aTraitName +] + +{ #category : #definition } +FamixMetamodelGenerator >> newTraitNamed: aClassName comment: aString [ + + ^ builder newTraitNamed: aClassName comment: aString +] + { #category : #definition } FamixMetamodelGenerator >> packageName [ From 0d2ea00280f69baed59555b1c4d0ddcc27a5faad Mon Sep 17 00:00:00 2001 From: uNouss Date: Fri, 28 Jun 2024 13:53:48 +0200 Subject: [PATCH 2/4] Fix #784 Add missing method --- .../FamixMetamodelGenerator.class.st | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st b/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st index d53beaee..4cefda83 100644 --- a/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st +++ b/src/Famix-MetamodelBuilder-Core/FamixMetamodelGenerator.class.st @@ -342,6 +342,12 @@ FamixMetamodelGenerator >> newAbstractClassNamed: aClassName [ ^ builder newAbstractClassNamed: aClassName ] +{ #category : #definition } +FamixMetamodelGenerator >> newAbstractClassNamed: aClassName comment: aComment [ + + ^ builder newAbstractClassNamed: aClassName comment: aComment +] + { #category : #definition } FamixMetamodelGenerator >> newBuilder [ ^ FamixMetamodelBuilder forGenerator: self From 40eefbca9c7b85b27dc6b4aab8b41c756f66d55c Mon Sep 17 00:00:00 2001 From: uNouss Date: Fri, 28 Jun 2024 13:54:45 +0200 Subject: [PATCH 3/4] Regeneration of metamodel for Famix java --- .../FamixJavaGenerator.class.st | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Famix-Java-Generator/FamixJavaGenerator.class.st b/src/Famix-Java-Generator/FamixJavaGenerator.class.st index f0a9c694..9f8a2966 100644 --- a/src/Famix-Java-Generator/FamixJavaGenerator.class.st +++ b/src/Famix-Java-Generator/FamixJavaGenerator.class.st @@ -134,43 +134,43 @@ FamixJavaGenerator >> defineClasses [ super defineClasses. - access := builder newClassNamed: #Access. - annotationInstance := builder newClassNamed: #AnnotationInstance. - annotationInstanceAttribute := builder newClassNamed: #AnnotationInstanceAttribute. - annotationType := builder newClassNamed: #AnnotationType. - annotationTypeAttribute := builder newClassNamed: #AnnotationTypeAttribute. - attribute := builder newClassNamed: #Attribute. - class := builder newClassNamed: #Class. - interface := builder newClassNamed: #Interface. + access := self newClassNamed: #Access. + annotationInstance := self newClassNamed: #AnnotationInstance. + annotationInstanceAttribute := self newClassNamed: #AnnotationInstanceAttribute. + annotationType := self newClassNamed: #AnnotationType. + annotationTypeAttribute := self newClassNamed: #AnnotationTypeAttribute. + attribute := self newClassNamed: #Attribute. + class := self newClassNamed: #Class. + interface := self newClassNamed: #Interface. interface withTesting. - implementation := builder newClassNamed: #Implementation. - containerEntity := builder newAbstractClassNamed: #ContainerEntity. - enum := builder newClassNamed: #Enum. - enumValue := builder newClassNamed: #EnumValue. - exception := builder newClassNamed: #Exception. - implicitVariable := builder newClassNamed: #ImplicitVariable. - import := builder newClassNamed: #Import. - indexedFileAnchor := builder newClassNamed: #IndexedFileAnchor. - inheritance := builder newClassNamed: #Inheritance. - invocation := builder newClassNamed: #Invocation. - localVariable := builder newClassNamed: #LocalVariable. - method := builder newClassNamed: #Method. - package := builder newClassNamed: #Package. - parameter := builder newClassNamed: #Parameter. - parameterType := builder newClassNamed: #ParameterType. - primitiveType := builder newClassNamed: #PrimitiveType. + implementation := self newClassNamed: #Implementation. + containerEntity := self newAbstractClassNamed: #ContainerEntity. + enum := self newClassNamed: #Enum. + enumValue := self newClassNamed: #EnumValue. + exception := self newClassNamed: #Exception. + implicitVariable := self newClassNamed: #ImplicitVariable. + import := self newClassNamed: #Import. + indexedFileAnchor := self newClassNamed: #IndexedFileAnchor. + inheritance := self newClassNamed: #Inheritance. + invocation := self newClassNamed: #Invocation. + localVariable := self newClassNamed: #LocalVariable. + method := self newClassNamed: #Method. + package := self newClassNamed: #Package. + parameter := self newClassNamed: #Parameter. + parameterType := self newClassNamed: #ParameterType. + primitiveType := self newClassNamed: #PrimitiveType. primitiveType withTesting. - reference := builder newClassNamed: #Reference. - type := builder newClassNamed: #Type. - unknownVariable := builder newClassNamed: #UnknownVariable. + reference := self newClassNamed: #Reference. + type := self newClassNamed: #Type. + unknownVariable := self newClassNamed: #UnknownVariable. - parametricClass := builder newClassNamed: #ParametricClass. - parametricMethod := builder newClassNamed: #ParametricMethod. - parametricInterface := builder newClassNamed: #ParametricInterface. - parameterConcretization := builder newClassNamed: #ParameterConcretization. + parametricClass := self newClassNamed: #ParametricClass. + parametricMethod := self newClassNamed: #ParametricMethod. + parametricInterface := self newClassNamed: #ParametricInterface. + parameterConcretization := self newClassNamed: #ParameterConcretization. - concretization := builder newClassNamed: #Concretization. - wildcard := builder newClassNamed: #Wildcard. + concretization := self newClassNamed: #Concretization. + wildcard := self newClassNamed: #Wildcard. ] { #category : #definition } @@ -392,22 +392,22 @@ FamixJavaGenerator >> defineRelations [ FamixJavaGenerator >> defineTraits [ super defineTraits. - tCanBeVolatile := builder newTraitNamed: #TCanBeVolatile. + tCanBeVolatile := self newTraitNamed: #TCanBeVolatile. tCanBeVolatile comment: self commentForTCanBeVolatile. - tCanBeTransient := builder newTraitNamed: #TCanBeTransient. + tCanBeTransient := self newTraitNamed: #TCanBeTransient. tCanBeTransient comment: self commentForTCanBeTransient. - tCanBeSynchronized := builder newTraitNamed: #TCanBeSynchronized. + tCanBeSynchronized := self newTraitNamed: #TCanBeSynchronized. tCanBeSynchronized comment: self commentForTCanBeSynchronized. - tWithInterfaces := builder newTraitNamed: #TWithInterfaces. + tWithInterfaces := self newTraitNamed: #TWithInterfaces. tWithInterfaces comment: self commentForTWithInterfaces. - tJavaClassMetrics := builder newTraitNamed: #TClassMetrics. + tJavaClassMetrics := self newTraitNamed: #TClassMetrics. - tBounded := builder newTraitNamed: #TBounded comment: self commentForTBounded. - tBound := builder newTraitNamed: #TBound comment: self commentForTBound. + tBounded := self newTraitNamed: #TBounded comment: self commentForTBounded. + tBound := self newTraitNamed: #TBound comment: self commentForTBound. ] { #category : #definition } From 798b4a499256be2b1a4445c36110040d2970e000 Mon Sep 17 00:00:00 2001 From: uNouss Date: Fri, 28 Jun 2024 13:55:11 +0200 Subject: [PATCH 4/4] Regeneration of metamodel for Famix pharo --- .../FamixPharoSmalltalkGenerator.class.st | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st b/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st index ce9c0292..2bdcbb1f 100644 --- a/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st +++ b/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st @@ -41,25 +41,25 @@ FamixPharoSmalltalkGenerator class >> prefix [ FamixPharoSmalltalkGenerator >> defineClasses [ super defineClasses. - access := builder newClassNamed: #Access. - annotationInstance := builder newClassNamed: #AnnotationInstance. - annotationInstanceAttribute := builder newClassNamed: #AnnotationInstanceAttribute. - annotationType := builder newClassNamed: #AnnotationType. - annotationTypeAttribute := builder newClassNamed: #AnnotationTypeAttribute. - attribute := builder newClassNamed: #Attribute. - class := builder newClassNamed: #Class. - globalVariable := builder newClassNamed: #GlobalVariable. - implicitVariable := builder newClassNamed: #ImplicitVariable. - inheritance := builder newClassNamed: #Inheritance. - invocation := builder newClassNamed: #Invocation. - localVariable := builder newClassNamed: #LocalVariable. - pharoEntitySourceAnchor := builder newClassNamed: #PharoEntitySourceAnchor. - method := builder newClassNamed: #Method. - namespace := builder newClassNamed: #Namespace. - package := builder newClassNamed: #Package. - parameter := builder newClassNamed: #Parameter. - reference := builder newClassNamed: #Reference. - unknownVariable := builder newClassNamed: #UnknownVariable. + access := self newClassNamed: #Access. + annotationInstance := self newClassNamed: #AnnotationInstance. + annotationInstanceAttribute := self newClassNamed: #AnnotationInstanceAttribute. + annotationType := self newClassNamed: #AnnotationType. + annotationTypeAttribute := self newClassNamed: #AnnotationTypeAttribute. + attribute := self newClassNamed: #Attribute. + class := self newClassNamed: #Class. + globalVariable := self newClassNamed: #GlobalVariable. + implicitVariable := self newClassNamed: #ImplicitVariable. + inheritance := self newClassNamed: #Inheritance. + invocation := self newClassNamed: #Invocation. + localVariable := self newClassNamed: #LocalVariable. + pharoEntitySourceAnchor := self newClassNamed: #PharoEntitySourceAnchor. + method := self newClassNamed: #Method. + namespace := self newClassNamed: #Namespace. + package := self newClassNamed: #Package. + parameter := self newClassNamed: #Parameter. + reference := self newClassNamed: #Reference. + unknownVariable := self newClassNamed: #UnknownVariable. ]