Fix metamodel generation

src/Famix-Tagging-Tests-Entities/FamixTagTestAccess.class.st

@@ -12,5 +12,5 @@ FamixTagTestAccess class >> annotation [
 	<FMClass: #Access super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestAttribute.class.st

@@ -12,5 +12,5 @@ FamixTagTestAttribute class >> annotation [
 	<FMClass: #Attribute super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestClass.class.st

@@ -12,10 +12,5 @@ FamixTagTestClass class >> annotation [
 	<FMClass: #Class super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
-]
-
-{ #category : #ambiguous }
-FamixTagTestClass >> numberOfLinesOfCode: aNumber [
-	self cacheAt: #numberOfLinesOfCode put: aNumber
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestEntity.class.st

@@ -10,7 +10,15 @@ FamixTagTestEntity class >> annotation [
 	<FMClass: #Entity super: #MooseEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	<abstract>
+	^ self
+]
+
+{ #category : #testing }
+FamixTagTestEntity class >> isAbstract [
+
+	<generated>
+	^ self == FamixTagTestEntity
 ]
 
 { #category : #meta }

src/Famix-Tagging-Tests-Entities/FamixTagTestInvocation.class.st

@@ -12,5 +12,5 @@ FamixTagTestInvocation class >> annotation [
 	<FMClass: #Invocation super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestMethod.class.st

@@ -12,5 +12,5 @@ FamixTagTestMethod class >> annotation [
 	<FMClass: #Method super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestModel.class.st

@@ -1,6 +1,8 @@
 Class {
 	#name : #FamixTagTestModel,
 	#superclass : #MooseModel,
+	#traits : 'FamixTagTestTEntityCreator',
+	#classTraits : 'FamixTagTestTEntityCreator classTrait',
 	#category : #'Famix-Tagging-Tests-Entities-Model'
 }
 

src/Famix-Tagging-Tests-Entities/FamixTagTestPackage.class.st

@@ -12,5 +12,5 @@ FamixTagTestPackage class >> annotation [
 	<FMClass: #Package super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestSourceTextAnchor.class.st

@@ -12,5 +12,5 @@ FamixTagTestSourceTextAnchor class >> annotation [
 	<FMClass: #SourceTextAnchor super: #FamixTagTestEntity>
 	<package: #'Famix-Tagging-Tests-Entities'>
 	<generated>
-	^self
+	^ self
 ]

src/Famix-Tagging-Tests-Entities/FamixTagTestTEntityCreator.trait.st

@@ -0,0 +1,94 @@
+"
+This trait is used by Famix models.
+It provides an API for creating entities and adding them to the model.
+"
+Trait {
+	#name : #FamixTagTestTEntityCreator,
+	#category : #'Famix-Tagging-Tests-Entities-Model'
+}
+
+{ #category : #meta }
+FamixTagTestTEntityCreator classSide >> annotation [
+
+	<FMClass: #TEntityCreator super: #Object>
+	<package: #'Famix-Tagging-Tests-Entities'>
+	<generated>
+	^ self
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newAccess [
+
+	<generated>
+	^ self add: FamixTagTestAccess new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newAttribute [
+
+	<generated>
+	^ self add: FamixTagTestAttribute new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newAttributeNamed: aName [
+
+	<generated>
+	^ self add: (FamixTagTestAttribute named: aName)
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newClass [
+
+	<generated>
+	^ self add: FamixTagTestClass new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newClassNamed: aName [
+
+	<generated>
+	^ self add: (FamixTagTestClass named: aName)
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newInvocation [
+
+	<generated>
+	^ self add: FamixTagTestInvocation new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newMethod [
+
+	<generated>
+	^ self add: FamixTagTestMethod new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newMethodNamed: aName [
+
+	<generated>
+	^ self add: (FamixTagTestMethod named: aName)
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newPackage [
+
+	<generated>
+	^ self add: FamixTagTestPackage new
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newPackageNamed: aName [
+
+	<generated>
+	^ self add: (FamixTagTestPackage named: aName)
+]
+
+{ #category : #'entity creation' }
+FamixTagTestTEntityCreator >> newSourceTextAnchor [
+
+	<generated>
+	^ self add: FamixTagTestSourceTextAnchor new
+]

src/Famix-Tagging-Tests-Generator/FamixTagTestingGenerator.class.st

@@ -45,41 +45,29 @@ FamixTagTestingGenerator >> defineClasses [
 	invocation := builder newClassNamed: #Invocation.
 	package := builder newClassNamed: #Package.
 
-	entity := builder newClassNamed: #Entity.
 	sourceTextAnchor := builder newClassNamed: #SourceTextAnchor.
 ]
 
 { #category : #definition }
 FamixTagTestingGenerator >> defineHierarchy [
+
 	super defineHierarchy.
 
-	access --|> entity.
 	access --|> #TAccess.
 
-	attribute --|> entity.
 	attribute --|> #TAttribute.
 
-	class --|> entity.
 	class --|> #TClass.
 	class --|> #TSourceEntity.
 
-	invocation --|> entity.
 	invocation --|> #TInvocation.
 
-	method --|> entity.
 	method --|> #TMethod.
 	method --|> #TSourceEntity.
 
-	package --|> entity.
 	package --|> #TPackage.
 	package --|> #TWithTypes.
 	package --|> #TNamedEntity.
 
 	sourceTextAnchor --|> #THasImmediateSource
 ]
-
-{ #category : #initialization }
-FamixTagTestingGenerator >> initialize [
-	super initialize.
-	self notImportedFromFile
-]