Merge pull request #624 from moosetechnology/605-FamixTClass-should-n…

…ot-use-TPackageable-by-default Remove TPackageable from FamixTClass and put it in the sub-meta-models.
moosetechnology · Sep 29, 2023 · a09e9af · a09e9af
2 parents 3bba042 + 85bc00c
commit a09e9af
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 12 deletions.
diff --git a/src/Famix-Java-Entities/FamixJavaClass.class.st b/src/Famix-Java-Entities/FamixJavaClass.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #FamixJavaClass,
 	#superclass : #FamixJavaType,
-	#traits : 'FamixJavaTClassMetrics + FamixTCanBeAbstract + FamixTCanBeClassSide + FamixTCanBeFinal + FamixTCanImplement + FamixTClass + FamixTClassMetrics + FamixTHasVisibility + FamixTImportable + FamixTLCOMMetrics + FamixTWithImports',
-	#classTraits : 'FamixJavaTClassMetrics classTrait + FamixTCanBeAbstract classTrait + FamixTCanBeClassSide classTrait + FamixTCanBeFinal classTrait + FamixTCanImplement classTrait + FamixTClass classTrait + FamixTClassMetrics classTrait + FamixTHasVisibility classTrait + FamixTImportable classTrait + FamixTLCOMMetrics classTrait + FamixTWithImports classTrait',
+	#traits : 'FamixJavaTClassMetrics + FamixTCanBeAbstract + FamixTCanBeClassSide + FamixTCanBeFinal + FamixTCanImplement + FamixTClass + FamixTClassMetrics + FamixTHasVisibility + FamixTImportable + FamixTLCOMMetrics + FamixTPackageable + FamixTWithImports',
+	#classTraits : 'FamixJavaTClassMetrics classTrait + FamixTCanBeAbstract classTrait + FamixTCanBeClassSide classTrait + FamixTCanBeFinal classTrait + FamixTCanImplement classTrait + FamixTClass classTrait + FamixTClassMetrics classTrait + FamixTHasVisibility classTrait + FamixTImportable classTrait + FamixTLCOMMetrics classTrait + FamixTPackageable classTrait + FamixTWithImports classTrait',
 	#category : #'Famix-Java-Entities-Entities'
 }
 

diff --git a/src/Famix-Java-Generator/FamixJavaGenerator.class.st b/src/Famix-Java-Generator/FamixJavaGenerator.class.st
@@ -231,6 +231,7 @@ FamixJavaGenerator >> defineHierarchy [
 	class --|> #TCanImplement.
 	class --|> #TWithImports.
 	class --|> #TImportable.
+	class --|> #TPackageable.
 
 	interface --|> type.
 	interface --|> #TPackageable.

diff --git a/src/Famix-MetamodelGeneration/FamixGenerator.class.st b/src/Famix-MetamodelGeneration/FamixGenerator.class.st
@@ -966,7 +966,6 @@ FamixGenerator >> defineHierarchy [
 	tClass --|> tWithInheritances.
 	tClass --|> tWithAttributes.
 	tClass inheritsFromTrait: tType without: { #queryStaticIncomingAssociations. #queryStaticOutgoingAssociations }.
-	tClass --|> tPackageable.
 	tClass --|> tInvocationsReceiver.
 	tClass --|> tWithComments.
 

diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #FamixStClass,
 	#superclass : #FamixStNamedEntity,
-	#traits : 'FamixTCanBeAbstract + FamixTClass + FamixTClassMetrics + FamixTWithTypes',
-	#classTraits : 'FamixTCanBeAbstract classTrait + FamixTClass classTrait + FamixTClassMetrics classTrait + FamixTWithTypes classTrait',
+	#traits : 'FamixTCanBeAbstract + FamixTClass + FamixTClassMetrics + FamixTPackageable + FamixTWithTypes',
+	#classTraits : 'FamixTCanBeAbstract classTrait + FamixTClass classTrait + FamixTClassMetrics classTrait + FamixTPackageable classTrait + FamixTWithTypes classTrait',
 	#category : #'Famix-PharoSmalltalk-Entities-Entities'
 }
 

diff --git a/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st b/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st
@@ -103,6 +103,7 @@ FamixPharoSmalltalkGenerator >> defineHierarchy [
 	class --|> #TClass.
 	class --|> #TCanBeAbstract.
 	class --|> #TClassMetrics.
+	class --|> #TPackageable.
 
 	globalVariable --|> namedEntity.
 	globalVariable --|> #TGlobalVariable.

diff --git a/src/Famix-Smalltalk-Utils/RBVisitorForFAMIXMetrics.class.st b/src/Famix-Smalltalk-Utils/RBVisitorForFAMIXMetrics.class.st
@@ -175,9 +175,12 @@ RBVisitorForFamixMetrics >> numberOfStatements: anObject [
 
 { #category : #enumerating }
 RBVisitorForFamixMetrics >> processMethod: aMethodEntity [
+
 	self methodEntity: aMethodEntity.
 	self compiledMethod ifNil: [ ^ self ].
-	(self compiledMethod methodClass parseTreeFor: self compiledMethod selector) ifNotNil: [ :parseTree | self visitMethodNode: parseTree ]
+	(self compiledMethod methodClass parseTreeForSelector:
+		 self compiledMethod selector) ifNotNil: [ :parseTree |
+		self visitMethodNode: parseTree ]
 ]
 
 { #category : #initialization }

diff --git a/src/Famix-Test1-Entities/FamixTest1Class.class.st b/src/Famix-Test1-Entities/FamixTest1Class.class.st
@@ -4,8 +4,8 @@ This a comment for the Class entity
 Class {
 	#name : #FamixTest1Class,
 	#superclass : #FamixTest1NamedEntity,
-	#traits : 'FamixTClass + FamixTSourceEntity + FamixTWithComments + FamixTWithSourceLanguages',
-	#classTraits : 'FamixTClass classTrait + FamixTSourceEntity classTrait + FamixTWithComments classTrait + FamixTWithSourceLanguages classTrait',
+	#traits : 'FamixTClass + FamixTPackageable + FamixTSourceEntity + FamixTWithComments + FamixTWithSourceLanguages',
+	#classTraits : 'FamixTClass classTrait + FamixTPackageable classTrait + FamixTSourceEntity classTrait + FamixTWithComments classTrait + FamixTWithSourceLanguages classTrait',
 	#category : #'Famix-Test1-Entities-Entities'
 }
 

diff --git a/src/Famix-Test3-Entities/FamixTest3Class.class.st b/src/Famix-Test3-Entities/FamixTest3Class.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #FamixTest3Class,
 	#superclass : #FamixTest3Type,
-	#traits : 'FamixTClass',
-	#classTraits : 'FamixTClass classTrait',
+	#traits : 'FamixTClass + FamixTPackageable',
+	#classTraits : 'FamixTClass classTrait + FamixTPackageable classTrait',
 	#category : #'Famix-Test3-Entities-Entities'
 }
 

diff --git a/src/Famix-TestGenerators/FamixTest1Generator.class.st b/src/Famix-TestGenerators/FamixTest1Generator.class.st
@@ -92,6 +92,7 @@ FamixTest1Generator >> defineHierarchy [
 		--|> #TWithSourceLanguages ;
 		--|> #TClass ;
 		--|> #TSourceEntity;
+		--|> #TPackageable;
 		--|> #TWithComments.
 
 	file --|> namedEntity.

diff --git a/src/Famix-TestGenerators/FamixTest3Generator.class.st b/src/Famix-TestGenerators/FamixTest3Generator.class.st
@@ -63,6 +63,7 @@ FamixTest3Generator >> defineHierarchy [
 
 	classEntity --|> type.
 	classEntity --|> #TClass.
+	classEntity --|> #TPackageable.
 
 	method --|> namedEntity.
 	method --|> #TMethod.

diff --git a/src/Famix-Traits/FamixTClass.trait.st b/src/Famix-Traits/FamixTClass.trait.st
@@ -7,8 +7,8 @@ A class is typically scoped in a namespace. To model nested or anonymous classes
 "
 Trait {
 	#name : #FamixTClass,
-	#traits : 'FamixTInvocationsReceiver + FamixTPackageable + (FamixTType - {#queryStaticIncomingAssociations. #queryStaticOutgoingAssociations}) + FamixTWithAttributes + FamixTWithComments + FamixTWithInheritances + FamixTWithMethods',
-	#classTraits : 'FamixTInvocationsReceiver classTrait + FamixTPackageable classTrait + FamixTType classTrait + FamixTWithAttributes classTrait + FamixTWithComments classTrait + FamixTWithInheritances classTrait + FamixTWithMethods classTrait',
+	#traits : 'FamixTInvocationsReceiver + (FamixTType - {#queryStaticIncomingAssociations. #queryStaticOutgoingAssociations}) + FamixTWithAttributes + FamixTWithComments + FamixTWithInheritances + FamixTWithMethods',
+	#classTraits : 'FamixTInvocationsReceiver classTrait + FamixTType classTrait + FamixTWithAttributes classTrait + FamixTWithComments classTrait + FamixTWithInheritances classTrait + FamixTWithMethods classTrait',
 	#category : #'Famix-Traits-Class'
 }