Merge pull request #896 from moosetechnology/846-remove-FamixTWithAnnotationInstanceAttributes

Fix #846 Remove TWithAnnotationInstanceAttributes

Author: ClotildeToullec

src/Famix-Java-Entities/FamixJavaAnnotationInstance.class.st

@@ -5,7 +5,7 @@
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `attributes` | `FamixTWithAnnotationInstanceAttributes` | `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | This corresponds to the actual values of the attributes in an AnnotationInstance|
+| `attributes` | `FamixTAnnotationInstance` | `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | This corresponds to the actual values of the attributes in an AnnotationInstance|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
@@ -19,8 +19,8 @@
 Class {
 	#name : #FamixJavaAnnotationInstance,
 	#superclass : #FamixJavaSourcedEntity,
-	#traits : 'FamixTAnnotationInstance + FamixTTypedAnnotationInstance + FamixTWithAnnotationInstanceAttributes',
-	#classTraits : 'FamixTAnnotationInstance classTrait + FamixTTypedAnnotationInstance classTrait + FamixTWithAnnotationInstanceAttributes classTrait',
+	#traits : 'FamixTAnnotationInstance + FamixTTypedAnnotationInstance',
+	#classTraits : 'FamixTAnnotationInstance classTrait + FamixTTypedAnnotationInstance classTrait',
 	#category : #'Famix-Java-Entities-Entities'
 }
 

src/Famix-Java-Entities/FamixJavaAnnotationInstanceAttribute.class.st

@@ -5,7 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTWithAnnotationInstanceAttributes` | The instance of the annotation in which the attribute is used.|
+| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTAnnotationInstance` | The instance of the annotation in which the attribute is used.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |

src/Famix-Java-Generator/FamixJavaGenerator.class.st

@@ -183,7 +183,6 @@ FamixJavaGenerator >> defineHierarchy [
 
 	annotationInstance --|> sourcedEntity.
 	annotationInstance --|> #TAnnotationInstance.
-	annotationInstance --|> #TWithAnnotationInstanceAttributes.
 	annotationInstance --|> #TTypedAnnotationInstance.
 
 	annotationInstanceAttribute --|> sourcedEntity.

src/Famix-MetamodelGeneration/FamixGenerator.class.st

@@ -58,7 +58,6 @@ Class {
 		'tTypedAnnotationInstance',
 		'tTypedAnnotationInstanceAttribute',
 		'tWithAccesses',
-		'tWithAnnotationInstanceAttributes',
 		'tWithAnnotationInstances',
 		'tWithAnnotationTypes',
 		'tWithAttributes',
@@ -840,12 +839,6 @@ FamixGenerator >> commentForTWithAccesses [
 	^ ''
 ]
 
-{ #category : #comments }
-FamixGenerator >> commentForTWithAnnotationInstanceAttributes [
-
-	^ ''
-]
-
 { #category : #comments }
 FamixGenerator >> commentForTWithAnnotationInstances [
 
@@ -1295,7 +1288,7 @@ FamixGenerator >> defineRelations [
 			comment: 'The instance of the annotation in which the attribute is used.';
 			container)
 		*-
-	((tWithAnnotationInstanceAttributes property: #attributes)
+	((tAnnotationInstance property: #attributes)
 			comment: 'This corresponds to the actual values of the attributes in an AnnotationInstance').
 
 	((tAnnotationType property: #instances)
@@ -1825,9 +1818,6 @@ FamixGenerator >> defineTraits [
 	tWithAccesses := builder newTraitNamed: #TWithAccesses.
 	tWithAccesses comment: self commentForTWithAccesses.
 
-	tWithAnnotationInstanceAttributes := builder newTraitNamed: #TWithAnnotationInstanceAttributes.
-	tWithAnnotationInstanceAttributes comment: self commentForTWithAnnotationInstanceAttributes.
-
 	tWithAnnotationInstances := builder newTraitNamed: #TWithAnnotationInstances.
 	tWithAnnotationInstances comment: self commentForTWithAnnotationInstances.
 

src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstance.class.st

@@ -5,7 +5,7 @@
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `attributes` | `FamixTWithAnnotationInstanceAttributes` | `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | This corresponds to the actual values of the attributes in an AnnotationInstance|
+| `attributes` | `FamixTAnnotationInstance` | `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | This corresponds to the actual values of the attributes in an AnnotationInstance|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
@@ -19,8 +19,8 @@
 Class {
 	#name : #FamixStAnnotationInstance,
 	#superclass : #FamixStSourcedEntity,
-	#traits : 'FamixTAnnotationInstance + FamixTTypedAnnotationInstance + FamixTWithAnnotationInstanceAttributes',
-	#classTraits : 'FamixTAnnotationInstance classTrait + FamixTTypedAnnotationInstance classTrait + FamixTWithAnnotationInstanceAttributes classTrait',
+	#traits : 'FamixTAnnotationInstance + FamixTTypedAnnotationInstance',
+	#classTraits : 'FamixTAnnotationInstance classTrait + FamixTTypedAnnotationInstance classTrait',
 	#category : #'Famix-PharoSmalltalk-Entities-Entities'
 }
 

src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstanceAttribute.class.st

@@ -5,7 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTWithAnnotationInstanceAttributes` | The instance of the annotation in which the attribute is used.|
+| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTAnnotationInstance` | The instance of the annotation in which the attribute is used.|
 
 ### Other
 | Relation | Origin | Opposite | Type | Comment |

src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st

@@ -72,7 +72,6 @@ FamixPharoSmalltalkGenerator >> defineHierarchy [
 
 	annotationInstance --|> sourcedEntity.
 	annotationInstance --|> #TAnnotationInstance.
-	annotationInstance --|> #TWithAnnotationInstanceAttributes.
 	annotationInstance --|> #TTypedAnnotationInstance.
 
 	annotationInstanceAttribute --|> sourcedEntity.

src/Famix-Traits/FamixTAnnotationInstance.trait.st

@@ -14,6 +14,11 @@ Instance Variables:
 ## Relations
 ======================
 
+### Children
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `attributes` | `FamixTAnnotationInstance` | `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | This corresponds to the actual values of the attributes in an AnnotationInstance|
+
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
@@ -25,7 +30,8 @@ Instance Variables:
 Trait {
 	#name : #FamixTAnnotationInstance,
 	#instVars : [
-		'#annotatedEntity => FMOne type: #FamixTWithAnnotationInstances opposite: #annotationInstances'
+		'#annotatedEntity => FMOne type: #FamixTWithAnnotationInstances opposite: #annotationInstances',
+		'#attributes => FMMany type: #FamixTAnnotationInstanceAttribute opposite: #parentAnnotationInstance'
 	],
 	#traits : 'TEntityMetaLevelDependency',
 	#classTraits : 'TEntityMetaLevelDependency classTrait',
@@ -48,6 +54,12 @@ FamixTAnnotationInstance classSide >> annotationFamixAnnotationInstanceGroup [
 	^ FamixAnnotationInstanceGroup
 ]
 
+{ #category : #adding }
+FamixTAnnotationInstance >> addAttribute: anObject [
+	<generated>
+	^ self attributes add: anObject
+]
+
 { #category : #accessing }
 FamixTAnnotationInstance >> annotatedEntity [
 	"Relation named: #annotatedEntity type: #FamixTWithAnnotationInstances opposite: #annotationInstances"
@@ -64,6 +76,23 @@ FamixTAnnotationInstance >> annotatedEntity: anObject [
 	annotatedEntity := anObject
 ]
 
+{ #category : #accessing }
+FamixTAnnotationInstance >> attributes [
+	"Relation named: #attributes type: #FamixTAnnotationInstanceAttribute opposite: #parentAnnotationInstance"
+
+	<generated>
+	<FMComment: 'This corresponds to the actual values of the attributes in an AnnotationInstance'>
+	<derived>
+	^ attributes
+]
+
+{ #category : #accessing }
+FamixTAnnotationInstance >> attributes: anObject [
+
+	<generated>
+	attributes value: anObject
+]
+
 { #category : #printing }
 FamixTAnnotationInstance >> displayStringOn: aStream [
 

src/Famix-Traits/FamixTAnnotationInstanceAttribute.trait.st

@@ -15,7 +15,7 @@ Instance Variables:
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTWithAnnotationInstanceAttributes` | The instance of the annotation in which the attribute is used.|
+| `parentAnnotationInstance` | `FamixTAnnotationInstanceAttribute` | `attributes` | `FamixTAnnotationInstance` | The instance of the annotation in which the attribute is used.|
 
 
 ## Properties
@@ -29,7 +29,7 @@ Instance Variables:
 Trait {
 	#name : #FamixTAnnotationInstanceAttribute,
 	#instVars : [
-		'#parentAnnotationInstance => FMOne type: #FamixTWithAnnotationInstanceAttributes opposite: #attributes',
+		'#parentAnnotationInstance => FMOne type: #FamixTAnnotationInstance opposite: #attributes',
 		'#value => FMProperty'
 	],
 	#traits : 'TEntityMetaLevelDependency',
@@ -48,7 +48,7 @@ FamixTAnnotationInstanceAttribute classSide >> annotation [
 
 { #category : #accessing }
 FamixTAnnotationInstanceAttribute >> parentAnnotationInstance [
-	"Relation named: #parentAnnotationInstance type: #FamixTWithAnnotationInstanceAttributes opposite: #attributes"
+	"Relation named: #parentAnnotationInstance type: #FamixTAnnotationInstance opposite: #attributes"
 
 	<generated>
 	<FMComment: 'The instance of the annotation in which the attribute is used.'>