Merge pull request #903 from moosetechnology/reoarganizing-famix-traits

ClotildeToullec · web-flow · commit bc822c810f21 · 2025-02-28T18:08:54.000+01:00
Reoarganizing famix traits
diff --git a/src/Famix-MetamodelGeneration/FamixGenerator.class.st b/src/Famix-MetamodelGeneration/FamixGenerator.class.st
@@ -102,7 +102,6 @@ Class {
 		'tRelativeSourceAnchor',
 		'tEnum',
 		'tHasVisibility',
-		'tClassWithVisibility',
 		'tCanBeFinal',
 		'tCanBeAbstract',
 		'tClassMetrics',
@@ -1058,9 +1057,6 @@ FamixGenerator >> defineHierarchy [
 	tClass --|> tInvocationsReceiver.
 	tClass --|> tWithComments.
 
-	tClassWithVisibility --|> tClass.
-	tClassWithVisibility --|> tHasVisibility.
-
 	tClassGroup --|> tTypeGroup.
 	
 	tComment  --|> #TEntityMetaLevelDependency.
@@ -1878,7 +1874,6 @@ FamixGenerator >> defineTraits [
 	tHasImmediateSource := builder newTraitNamed: #THasImmediateSource comment: self commentForTHasImmediateSource.
 
 	tHasVisibility := builder newTraitNamed: #THasVisibility.
-	tClassWithVisibility := builder newTraitNamed: #TClassWithVisibility.
 
 	tWithStatements := builder newTraitNamed: #TWithStatements.
 	tWithStatements testingSelector: #isBehavioural.
diff --git a/src/Famix-Traits/FamixTCanBeAbstract.trait.st b/src/Famix-Traits/FamixTCanBeAbstract.trait.st
@@ -12,7 +12,7 @@ Trait {
 	#instVars : [
 		'#isAbstract => FMProperty defaultValue: false'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTCanBeClassSide.trait.st b/src/Famix-Traits/FamixTCanBeClassSide.trait.st
@@ -12,7 +12,7 @@ Trait {
 	#instVars : [
 		'#isClassSide => FMProperty defaultValue: false'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTCanBeFinal.trait.st b/src/Famix-Traits/FamixTCanBeFinal.trait.st
@@ -12,7 +12,7 @@ Trait {
 	#instVars : [
 		'#isFinal => FMProperty defaultValue: false'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTCanBeStub.trait.st b/src/Famix-Traits/FamixTCanBeStub.trait.st
@@ -23,7 +23,7 @@ Trait {
 	],
 	#traits : 'FamixTSourceEntity',
 	#classTraits : 'FamixTSourceEntity classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTCanImplement.trait.st b/src/Famix-Traits/FamixTCanImplement.trait.st
@@ -17,7 +17,7 @@ Trait {
 	#instVars : [
 		'#interfaceImplementations => FMMany type: #FamixTImplementation opposite: #implementingClass'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Implementation'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTClassWithVisibility.trait.st b/src/Famix-Traits/FamixTClassWithVisibility.trait.st
diff --git a/src/Famix-Traits/FamixTEnum.trait.st b/src/Famix-Traits/FamixTEnum.trait.st
@@ -49,7 +49,7 @@ Trait {
 	#name : #FamixTEnum,
 	#traits : 'FamixTType + FamixTWithEnumValues',
 	#classTraits : 'FamixTType classTrait + FamixTWithEnumValues classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Enum'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTEnumValue.trait.st b/src/Famix-Traits/FamixTEnumValue.trait.st
@@ -47,7 +47,7 @@ Trait {
 	],
 	#traits : 'FamixTStructuralEntity',
 	#classTraits : 'FamixTStructuralEntity classTrait',
-	#category : #'Famix-Traits-EnumValue'
+	#category : #'Famix-Traits-Enum'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTHasKind.trait.st b/src/Famix-Traits/FamixTHasKind.trait.st
@@ -14,7 +14,7 @@ Trait {
 	#instVars : [
 		'#kind => FMProperty'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTHasVisibility.trait.st b/src/Famix-Traits/FamixTHasVisibility.trait.st
@@ -12,7 +12,7 @@ Trait {
 	#instVars : [
 		'#visibility => FMProperty'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-PrimitiveProperties'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTImplementable.trait.st b/src/Famix-Traits/FamixTImplementable.trait.st
@@ -17,7 +17,7 @@ Trait {
 	#instVars : [
 		'#implementations => FMMany type: #FamixTImplementation opposite: #interface'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Implementation'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTImplementation.trait.st b/src/Famix-Traits/FamixTImplementation.trait.st
@@ -30,7 +30,7 @@ Trait {
 	],
 	#traits : 'FamixTAssociation',
 	#classTraits : 'FamixTAssociation classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Implementation'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTImport.trait.st b/src/Famix-Traits/FamixTImport.trait.st
@@ -30,7 +30,7 @@ Trait {
 	],
 	#traits : 'FamixTAssociation',
 	#classTraits : 'FamixTAssociation classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Import'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTImportable.trait.st b/src/Famix-Traits/FamixTImportable.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#incomingImports => FMMany type: #FamixTImport opposite: #importedEntity'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Import'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTLambda.trait.st b/src/Famix-Traits/FamixTLambda.trait.st
@@ -49,7 +49,7 @@ Trait {
 	],
 	#traits : 'FamixTHasSignature + FamixTInvocable + FamixTWithLocalVariables + FamixTWithParameters + FamixTWithStatements + TEntityMetaLevelDependency',
 	#classTraits : 'FamixTHasSignature classTrait + FamixTInvocable classTrait + FamixTWithLocalVariables classTrait + FamixTWithParameters classTrait + FamixTWithStatements classTrait + TEntityMetaLevelDependency classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Lambda'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTMethodMetrics.trait.st b/src/Famix-Traits/FamixTMethodMetrics.trait.st
@@ -1,6 +1,6 @@
 Trait {
 	#name : #FamixTMethodMetrics,
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Behavioral'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTPrimitiveType.trait.st b/src/Famix-Traits/FamixTPrimitiveType.trait.st
@@ -32,7 +32,7 @@ Trait {
 	#name : #FamixTPrimitiveType,
 	#traits : 'FamixTType',
 	#classTraits : 'FamixTType classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Type'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTShadowable.trait.st b/src/Famix-Traits/FamixTShadowable.trait.st
@@ -40,7 +40,7 @@ Trait {
 	#instVars : [
 		'#shadowingEntities => FMMany type: #FamixTShadower opposite: #shadowedEntity'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Shadowing'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTShadower.trait.st b/src/Famix-Traits/FamixTShadower.trait.st
@@ -40,7 +40,7 @@ Trait {
 	#instVars : [
 		'#shadowedEntity => FMOne type: #FamixTShadowable opposite: #shadowingEntities'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Shadowing'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTStructuralEntity.trait.st b/src/Famix-Traits/FamixTStructuralEntity.trait.st
@@ -29,7 +29,7 @@ Trait {
 	#name : #FamixTStructuralEntity,
 	#traits : 'FamixTAccessible + FamixTCanBeStub + FamixTNamedEntity + FamixTTypedEntity + TEntityMetaLevelDependency',
 	#classTraits : 'FamixTAccessible classTrait + FamixTCanBeStub classTrait + FamixTNamedEntity classTrait + FamixTTypedEntity classTrait + TEntityMetaLevelDependency classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-StructuralEntity'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTThrowable.trait.st b/src/Famix-Traits/FamixTThrowable.trait.st
@@ -21,7 +21,7 @@ Trait {
 		'#declaringEntities => FMMany type: #FamixTWithExceptions opposite: #declaredExceptions',
 		'#throwingEntities => FMMany type: #FamixTWithExceptions opposite: #thrownExceptions'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Exception'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTUnknownVariable.trait.st b/src/Famix-Traits/FamixTUnknownVariable.trait.st
@@ -27,7 +27,7 @@ Trait {
 	#name : #FamixTUnknownVariable,
 	#traits : 'FamixTStructuralEntity',
 	#classTraits : 'FamixTStructuralEntity classTrait',
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-StructuralEntity'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithCompilationUnits.trait.st b/src/Famix-Traits/FamixTWithCompilationUnits.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#compilationUnit => FMOne type: #FamixTCompilationUnit opposite: #compilationUnitOwner'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-CompilationUnit'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithEnumValues.trait.st b/src/Famix-Traits/FamixTWithEnumValues.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#enumValues => FMMany type: #FamixTEnumValue opposite: #parentEnum'
 	],
-	#category : #'Famix-Traits-EnumValue'
+	#category : #'Famix-Traits-Enum'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithHeaders.trait.st b/src/Famix-Traits/FamixTWithHeaders.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#header => FMOne type: #FamixTHeader opposite: #headerOwner'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Header'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithImports.trait.st b/src/Famix-Traits/FamixTWithImports.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#imports => FMMany type: #FamixTImport opposite: #importingEntity'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Import'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithLambdas.trait.st b/src/Famix-Traits/FamixTWithLambdas.trait.st
@@ -17,7 +17,7 @@ Trait {
 	#instVars : [
 		'#lambdas => FMMany type: #FamixTLambda opposite: #lambdaContainer'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-Lambda'
 }
 
 { #category : #meta }
diff --git a/src/Famix-Traits/FamixTWithSourceLanguages.trait.st b/src/Famix-Traits/FamixTWithSourceLanguages.trait.st
@@ -15,7 +15,7 @@ Trait {
 	#instVars : [
 		'#declaredSourceLanguage => FMOne type: #FamixTSourceLanguage opposite: #sourcedEntities'
 	],
-	#category : #'Famix-Traits-Traits'
+	#category : #'Famix-Traits-SourceLanguage'
 }
 
 { #category : #meta }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Trait {`
`12`	`12`	`#instVars : [`
`13`	`13`	`'#isAbstract => FMProperty defaultValue: false'`
`14`	`14`	`],`
`15`		`- #category : #'Famix-Traits-Traits'`
	`15`	`+ #category : #'Famix-Traits-PrimitiveProperties'`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ Trait {`
`23`	`23`	`],`
`24`	`24`	`#traits : 'FamixTSourceEntity',`
`25`	`25`	`#classTraits : 'FamixTSourceEntity classTrait',`
`26`		`- #category : #'Famix-Traits-Traits'`
	`26`	`+ #category : #'Famix-Traits-PrimitiveProperties'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Trait {`
`17`	`17`	`#instVars : [`
`18`	`18`	`'#interfaceImplementations => FMMany type: #FamixTImplementation opposite: #implementingClass'`
`19`	`19`	`],`
`20`		`- #category : #'Famix-Traits-Traits'`
	`20`	`+ #category : #'Famix-Traits-Implementation'`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ Trait {`
`49`	`49`	`#name : #FamixTEnum,`
`50`	`50`	`#traits : 'FamixTType + FamixTWithEnumValues',`
`51`	`51`	`#classTraits : 'FamixTType classTrait + FamixTWithEnumValues classTrait',`
`52`		`- #category : #'Famix-Traits-Traits'`
	`52`	`+ #category : #'Famix-Traits-Enum'`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ Trait {`
`47`	`47`	`],`
`48`	`48`	`#traits : 'FamixTStructuralEntity',`
`49`	`49`	`#classTraits : 'FamixTStructuralEntity classTrait',`
`50`		`- #category : #'Famix-Traits-EnumValue'`
	`50`	`+ #category : #'Famix-Traits-Enum'`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Trait {`
`14`	`14`	`#instVars : [`
`15`	`15`	`'#kind => FMProperty'`
`16`	`16`	`],`
`17`		`- #category : #'Famix-Traits-Traits'`
	`17`	`+ #category : #'Famix-Traits-PrimitiveProperties'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ Trait {`
`30`	`30`	`],`
`31`	`31`	`#traits : 'FamixTAssociation',`
`32`	`32`	`#classTraits : 'FamixTAssociation classTrait',`
`33`		`- #category : #'Famix-Traits-Traits'`
	`33`	`+ #category : #'Famix-Traits-Implementation'`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Trait {`
`15`	`15`	`#instVars : [`
`16`	`16`	`'#incomingImports => FMMany type: #FamixTImport opposite: #importedEntity'`
`17`	`17`	`],`
`18`		`- #category : #'Famix-Traits-Traits'`
	`18`	`+ #category : #'Famix-Traits-Import'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`Trait {`
`2`	`2`	`#name : #FamixTMethodMetrics,`
`3`		`- #category : #'Famix-Traits-Traits'`
	`3`	`+ #category : #'Famix-Traits-Behavioral'`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`{ #category : #meta }`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ Trait {`
`32`	`32`	`#name : #FamixTPrimitiveType,`
`33`	`33`	`#traits : 'FamixTType',`
`34`	`34`	`#classTraits : 'FamixTType classTrait',`
`35`		`- #category : #'Famix-Traits-Traits'`
	`35`	`+ #category : #'Famix-Traits-Type'`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`{ #category : #meta }`