Merge with changes made during sprint

Author: ClotildeToullec

src/Famix-Java-Visitor/FamixJavaTVisitor.trait.st

@@ -30,8 +30,6 @@ FamixJavaTVisitor >> visitFamixJavaAnnotationInstance: aFamixJavaAnnotationInsta
 
 	<generated>
 	self visitFamixTAnnotationInstance: aFamixJavaAnnotationInstance.
-	self visitFamixTTypedAnnotationInstance: aFamixJavaAnnotationInstance.
-	self visitFamixTWithAnnotationInstanceAttributes: aFamixJavaAnnotationInstance.
 	self visitFamixJavaSourcedEntity: aFamixJavaAnnotationInstance
 ]
 
@@ -40,7 +38,6 @@ FamixJavaTVisitor >> visitFamixJavaAnnotationInstanceAttribute: aFamixJavaAnnota
 
 	<generated>
 	self visitFamixTAnnotationInstanceAttribute: aFamixJavaAnnotationInstanceAttribute.
-	self visitFamixTTypedAnnotationInstanceAttribute: aFamixJavaAnnotationInstanceAttribute.
 	self visitFamixJavaSourcedEntity: aFamixJavaAnnotationInstanceAttribute
 ]
 
@@ -63,7 +60,6 @@ FamixJavaTVisitor >> visitFamixJavaAnnotationTypeAttribute: aFamixJavaAnnotation
 
 	<generated>
 	self visitFamixTAnnotationTypeAttribute: aFamixJavaAnnotationTypeAttribute.
-	self visitFamixTTypedAnnotationInstanceAttribute: aFamixJavaAnnotationTypeAttribute.
 	self visitFamixTWithComments: aFamixJavaAnnotationTypeAttribute.
 	self visitFamixJavaVariable: aFamixJavaAnnotationTypeAttribute
 ]

src/Famix-Visitor/FamixClassGroup.extension.st

@@ -53,7 +53,9 @@ FamixTVisitor >> visitFamixTAnnotationInstance: aFamixTAnnotationInstance [
 	<generated>
 	self visitTEntityMetaLevelDependency: aFamixTAnnotationInstance.
 
-	self visitEntity: aFamixTAnnotationInstance annotatedEntity
+	self visitEntity: aFamixTAnnotationInstance annotatedEntity.
+	self visitCollection: aFamixTAnnotationInstance attributes.
+	self visitEntity: aFamixTAnnotationInstance annotationType
 ]
 
 { #category : #visiting }
@@ -62,7 +64,8 @@ FamixTVisitor >> visitFamixTAnnotationInstanceAttribute: aFamixTAnnotationInstan
 	<generated>
 	self visitTEntityMetaLevelDependency: aFamixTAnnotationInstanceAttribute.
 
-	self visitEntity: aFamixTAnnotationInstanceAttribute parentAnnotationInstance
+	self visitEntity: aFamixTAnnotationInstanceAttribute parentAnnotationInstance.
+	self visitEntity: aFamixTAnnotationInstanceAttribute annotationTypeAttribute
 ]
 
 { #category : #visiting }
@@ -156,14 +159,6 @@ FamixTVisitor >> visitFamixTClassMetrics: aFamixTClassMetrics [
 
 ]
 
-{ #category : #visiting }
-FamixTVisitor >> visitFamixTClassWithVisibility: aFamixTClassWithVisibility [
-
-	<generated>
-	self visitFamixTClass: aFamixTClassWithVisibility.
-	self visitFamixTHasVisibility: aFamixTClassWithVisibility
-]
-
 { #category : #visiting }
 FamixTVisitor >> visitFamixTCohesionCouplingMetrics: aFamixTCohesionCouplingMetrics [
 
@@ -289,6 +284,8 @@ FamixTVisitor >> visitFamixTFileNavigation: aFamixTFileNavigation [
 FamixTVisitor >> visitFamixTFileSystemEntity: aFamixTFileSystemEntity [
 
 	<generated>
+	self visitFamixTNamedEntity: aFamixTFileSystemEntity.
+
 	self visitEntity: aFamixTFileSystemEntity parentFolder
 ]
 
@@ -729,7 +726,7 @@ FamixTVisitor >> visitFamixTTraitUsage: aFamixTTraitUsage [
 FamixTVisitor >> visitFamixTTraitUser: aFamixTTraitUser [
 
 	<generated>
-	self visitCollection: aFamixTTraitUser outgoingTraitUsages
+	self visitCollection: aFamixTTraitUser traitUsages
 ]
 
 { #category : #visiting }
@@ -752,20 +749,6 @@ FamixTVisitor >> visitFamixTTypeAlias: aFamixTTypeAlias [
 	self visitEntity: aFamixTTypeAlias aliasedType
 ]
 
-{ #category : #visiting }
-FamixTVisitor >> visitFamixTTypedAnnotationInstance: aFamixTTypedAnnotationInstance [
-
-	<generated>
-	self visitEntity: aFamixTTypedAnnotationInstance annotationType
-]
-
-{ #category : #visiting }
-FamixTVisitor >> visitFamixTTypedAnnotationInstanceAttribute: aFamixTTypedAnnotationInstanceAttribute [
-
-	<generated>
-	self visitEntity: aFamixTTypedAnnotationInstanceAttribute annotationTypeAttribute
-]
-
 { #category : #visiting }
 FamixTVisitor >> visitFamixTTypedEntity: aFamixTTypedEntity [
 
@@ -787,13 +770,6 @@ FamixTVisitor >> visitFamixTWithAccesses: aFamixTWithAccesses [
 	self visitCollection: aFamixTWithAccesses accesses
 ]
 
-{ #category : #visiting }
-FamixTVisitor >> visitFamixTWithAnnotationInstanceAttributes: aFamixTWithAnnotationInstanceAttributes [
-
-	<generated>
-	self visitCollection: aFamixTWithAnnotationInstanceAttributes attributes
-]
-
 { #category : #visiting }
 FamixTVisitor >> visitFamixTWithAnnotationInstances: aFamixTWithAnnotationInstances [
 
@@ -906,7 +882,7 @@ FamixTVisitor >> visitFamixTWithImplicitVariables: aFamixTWithImplicitVariables
 FamixTVisitor >> visitFamixTWithImports: aFamixTWithImports [
 
 	<generated>
-	self visitCollection: aFamixTWithImports outgoingImports
+	self visitCollection: aFamixTWithImports imports
 ]
 
 { #category : #visiting }