Skip to content

Commit abee172

Browse files
Gabriel-DarbordGabriel-Darbord
authored
Merge pull request #708 from moosetechnology/706-Rename-relationship-between-TParametricEntity-and-TConcretisation
Smooth out Parametric update
2 parents 0e54eb2 + 7732152 commit abee172

23 files changed

+505
-469
lines changed

‎src/Famix-Java-Entities/FamixJavaConcretisation.class.st renamed to ‎src/Famix-Java-Entities/FamixJavaConcretization.class.st

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
### Association source
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
8-
| `genericEntity` | `FamixTConcretisation` | `concretisations` | `FamixTParametricEntity` | genericEntity linked to in this relationship. from-side of the association|
8+
| `genericEntity` | `FamixTConcretization` | `concretizations` | `FamixTParametricEntity` | Generic entity linked to in this relationship. from-side of the association|
99
1010
### Association target
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `concreteEntity` | `FamixTConcretisation` | `genericEntity` | `FamixTParametricEntity` | concreteEntity linked to in this relationship. to-side of the association|
13+
| `concreteEntity` | `FamixTConcretization` | `genericization` | `FamixTParametricEntity` | Concrete entity linked to in this relationship. to-side of the association|
1414
1515
### Other
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
1818
| `next` | `FamixTAssociation` | `previous` | `FamixTAssociation` | Next association in an ordered collection of associations. Currently not supported by the Moose importer|
19-
| `parameterConcretisations` | `FamixTConcretisation` | `concretisations` | `FamixTParameterConcretisation` | |
19+
| `parameterConcretizations` | `FamixTConcretization` | `concretizations` | `FamixTParameterConcretization` | |
2020
| `previous` | `FamixTAssociation` | `next` | `FamixTAssociation` | Previous association in an ordered collection of associations. Currently not supported by the Moose importer|
2121
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2222
@@ -30,17 +30,17 @@
3030
3131
"
3232
Class {
33-
#name : #FamixJavaConcretisation,
33+
#name : #FamixJavaConcretization,
3434
#superclass : #FamixJavaEntity,
35-
#traits : 'FamixTConcretisation',
36-
#classTraits : 'FamixTConcretisation classTrait',
35+
#traits : 'FamixTConcretization',
36+
#classTraits : 'FamixTConcretization classTrait',
3737
#category : #'Famix-Java-Entities-Entities'
3838
}
3939

4040
{ #category : #meta }
41-
FamixJavaConcretisation class >> annotation [
41+
FamixJavaConcretization class >> annotation [
4242

43-
<FMClass: #Concretisation super: #FamixJavaEntity>
43+
<FMClass: #Concretization super: #FamixJavaEntity>
4444
<package: #'Famix-Java-Entities'>
4545
<generated>
4646
^ self

‎src/Famix-Java-Entities/FamixJavaImportingContext.class.st

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ FamixJavaImportingContext >> importComment [
7272
]
7373

7474
{ #category : #importing }
75-
FamixJavaImportingContext >> importConcretisation [
75+
FamixJavaImportingContext >> importConcretization [
7676

7777
<generated>
78-
^ self importAssociation: (self class fm3ClassNamed: #Concretisation)
78+
^ self importAssociation: (self class fm3ClassNamed: #Concretization)
7979
]
8080

8181
{ #category : #importing }
@@ -177,10 +177,10 @@ FamixJavaImportingContext >> importParameter [
177177
]
178178

179179
{ #category : #importing }
180-
FamixJavaImportingContext >> importParameterConcretisation [
180+
FamixJavaImportingContext >> importParameterConcretization [
181181

182182
<generated>
183-
^ self importAssociation: (self class fm3ClassNamed: #ParameterConcretisation)
183+
^ self importAssociation: (self class fm3ClassNamed: #ParameterConcretization)
184184
]
185185

186186
{ #category : #importing }
@@ -324,10 +324,10 @@ FamixJavaImportingContext >> shouldImportComment [
324324
]
325325

326326
{ #category : #testing }
327-
FamixJavaImportingContext >> shouldImportConcretisation [
327+
FamixJavaImportingContext >> shouldImportConcretization [
328328

329329
<generated>
330-
^ self shouldImport: #Concretisation
330+
^ self shouldImport: #Concretization
331331
]
332332

333333
{ #category : #testing }
@@ -429,10 +429,10 @@ FamixJavaImportingContext >> shouldImportParameter [
429429
]
430430

431431
{ #category : #testing }
432-
FamixJavaImportingContext >> shouldImportParameterConcretisation [
432+
FamixJavaImportingContext >> shouldImportParameterConcretization [
433433

434434
<generated>
435-
^ self shouldImport: #ParameterConcretisation
435+
^ self shouldImport: #ParameterConcretization
436436
]
437437

438438
{ #category : #testing }

‎src/Famix-Java-Entities/FamixJavaParameterConcretisation.class.st renamed to ‎src/Famix-Java-Entities/FamixJavaParameterConcretization.class.st

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
### Association source
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
8-
| `genericParameter` | `FamixTParameterConcretisation` | `concretisations` | `FamixTGenericParameterType` | genericParameter linked to in this relationship. from-side of the association|
8+
| `genericParameter` | `FamixTParameterConcretization` | `concretizations` | `FamixTGenericParameterType` | Generic parameter linked to in this relationship. from-side of the association|
99
1010
### Association target
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `concreteParameter` | `FamixTParameterConcretisation` | `generics` | `FamixTConcreteParameterType` | concreteParameter linked to in this relationship. to-side of the association|
13+
| `concreteParameter` | `FamixTParameterConcretization` | `generics` | `FamixTConcreteParameterType` | Concrete parameter linked to in this relationship. to-side of the association|
1414
1515
### Other
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
18-
| `concretisations` | `FamixTParameterConcretisation` | `parameterConcretisations` | `FamixTConcretisation` | |
18+
| `concretizations` | `FamixTParameterConcretization` | `parameterConcretizations` | `FamixTConcretization` | |
1919
| `next` | `FamixTAssociation` | `previous` | `FamixTAssociation` | Next association in an ordered collection of associations. Currently not supported by the Moose importer|
2020
| `previous` | `FamixTAssociation` | `next` | `FamixTAssociation` | Previous association in an ordered collection of associations. Currently not supported by the Moose importer|
2121
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
@@ -30,17 +30,17 @@
3030
3131
"
3232
Class {
33-
#name : #FamixJavaParameterConcretisation,
33+
#name : #FamixJavaParameterConcretization,
3434
#superclass : #FamixJavaEntity,
35-
#traits : 'FamixTParameterConcretisation',
36-
#classTraits : 'FamixTParameterConcretisation classTrait',
35+
#traits : 'FamixTParameterConcretization',
36+
#classTraits : 'FamixTParameterConcretization classTrait',
3737
#category : #'Famix-Java-Entities-Entities'
3838
}
3939

4040
{ #category : #meta }
41-
FamixJavaParameterConcretisation class >> annotation [
41+
FamixJavaParameterConcretization class >> annotation [
4242

43-
<FMClass: #ParameterConcretisation super: #FamixJavaEntity>
43+
<FMClass: #ParameterConcretization super: #FamixJavaEntity>
4444
<package: #'Famix-Java-Entities'>
4545
<generated>
4646
^ self

‎src/Famix-Java-Entities/FamixJavaParameterType.class.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
### Outgoing dependencies
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `concretisations` | `FamixTGenericParameterType` | `genericParameter` | `FamixTParameterConcretisation` | concretisations relationships, i.e. known concretisation of this type.|
13+
| `concretizations` | `FamixTGenericParameterType` | `genericParameter` | `FamixTParameterConcretization` | Concretization relationships, i.e. known concretizations of this type.|
1414
| `superInheritances` | `FamixTWithInheritances` | `subclass` | `FamixTInheritance` | Superinheritance relationships, i.e. known superclasses of this type.|
1515
1616
### Incoming dependencies
@@ -25,7 +25,7 @@
2525
| `catchingEntities` | `FamixTThrowable` | `caughtExceptions` | `FamixTWithExceptions` | |
2626
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
2727
| `declaringEntities` | `FamixTThrowable` | `declaredExceptions` | `FamixTWithExceptions` | |
28-
| `genericEntities` | `FamixTGenericParameterType` | `genericParameters` | `FamixTParametricEntity` | genericEntity of a parameter|
28+
| `genericEntities` | `FamixTGenericParameterType` | `genericParameters` | `FamixTParametricEntity` | The generic entities that use me.|
2929
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
3030
| `throwingEntities` | `FamixTThrowable` | `thrownExceptions` | `FamixTWithExceptions` | |
3131
| `typedEntities` | `FamixTType` | `declaredType` | `FamixTTypedEntity` | Entities that have this type as declaredType|

‎src/Famix-Java-Entities/FamixJavaParametricClass.class.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
### Outgoing dependencies
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
8-
| `concretisations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretisation` | concretisations relationships, i.e. known concreteEntities of this type.|
8+
| `concretizations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretization` | Concretization relationships, i.e. the associations of known concrete entities of this type.|
99
1010
### Incoming dependencies
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `genericEntity` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretisation` | genericEntity relationships, i.e. known genericEntity of this type.|
13+
| `genericization` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretization` | Generic entity relationship, i.e. the association to the generic entity of this type.|
1414
1515
### Other
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
18-
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | list of concreteParameters|
19-
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | list of genericParameters|
18+
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | List of concrete parameters.|
19+
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | List of generic parameters.|
2020
2121
2222

‎src/Famix-Java-Entities/FamixJavaParametricInterface.class.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
### Outgoing dependencies
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
8-
| `concretisations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretisation` | concretisations relationships, i.e. known concreteEntities of this type.|
8+
| `concretizations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretization` | Concretization relationships, i.e. the associations of known concrete entities of this type.|
99
1010
### Incoming dependencies
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `genericEntity` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretisation` | genericEntity relationships, i.e. known genericEntity of this type.|
13+
| `genericization` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretization` | Generic entity relationship, i.e. the association to the generic entity of this type.|
1414
1515
### Other
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
18-
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | list of concreteParameters|
19-
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | list of genericParameters|
18+
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | List of concrete parameters.|
19+
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | List of generic parameters.|
2020
2121
2222

‎src/Famix-Java-Entities/FamixJavaParametricMethod.class.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
### Outgoing dependencies
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
8-
| `concretisations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretisation` | concretisations relationships, i.e. known concreteEntities of this type.|
8+
| `concretizations` | `FamixTParametricEntity` | `genericEntity` | `FamixTConcretization` | Concretization relationships, i.e. the associations of known concrete entities of this type.|
99
1010
### Incoming dependencies
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
13-
| `genericEntity` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretisation` | genericEntity relationships, i.e. known genericEntity of this type.|
13+
| `genericization` | `FamixTParametricEntity` | `concreteEntity` | `FamixTConcretization` | Generic entity relationship, i.e. the association to the generic entity of this type.|
1414
1515
### Other
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
18-
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | list of concreteParameters|
19-
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | list of genericParameters|
18+
| `concreteParameters` | `FamixTParametricEntity` | `concreteEntities` | `FamixTConcreteParameterType` | List of concrete parameters.|
19+
| `genericParameters` | `FamixTParametricEntity` | `genericEntities` | `FamixTGenericParameterType` | List of generic parameters.|
2020
2121
2222

‎src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ FamixJavaTEntityCreator >> newComment [
9696
]
9797

9898
{ #category : #'entity creation' }
99-
FamixJavaTEntityCreator >> newConcretisation [
99+
FamixJavaTEntityCreator >> newConcretization [
100100

101101
<generated>
102-
^ self add: FamixJavaConcretisation new
102+
^ self add: FamixJavaConcretization new
103103
]
104104

105105
{ #category : #'entity creation' }
@@ -250,10 +250,10 @@ FamixJavaTEntityCreator >> newParameter [
250250
]
251251

252252
{ #category : #'entity creation' }
253-
FamixJavaTEntityCreator >> newParameterConcretisation [
253+
FamixJavaTEntityCreator >> newParameterConcretization [
254254

255255
<generated>
256-
^ self add: FamixJavaParameterConcretisation new
256+
^ self add: FamixJavaParameterConcretization new
257257
]
258258

259259
{ #category : #'entity creation' }

‎src/Famix-Java-Entities/FamixJavaType.class.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
### Incoming dependencies
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
18-
| `generics` | `FamixTConcreteParameterType` | `concreteParameter` | `FamixTParameterConcretisation` | generic relationships, i.e. known genericParameter of this type.|
18+
| `generics` | `FamixTConcreteParameterType` | `concreteParameter` | `FamixTParameterConcretization` | Generic relationships, i.e. known genericParameter of this type.|
1919
| `incomingReferences` | `FamixTReferenceable` | `referredType` | `FamixTReference` | References to this entity by other entities.|
2020
2121
### Other
2222
| Relation | Origin | Opposite | Type | Comment |
2323
|---|
24-
| `concreteEntities` | `FamixTConcreteParameterType` | `concreteParameters` | `FamixTParametricEntity` | concreteEntity of a parameter|
24+
| `concreteEntities` | `FamixTConcreteParameterType` | `concreteParameters` | `FamixTParametricEntity` | The concrete entities that use me.|
2525
| `lowerBoundedWildcards` | `FamixJavaTBound` | `lowerBound` | `FamixJavaTBounded` | Wildcards lower bounded by this bound.|
2626
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2727
| `typedEntities` | `FamixTType` | `declaredType` | `FamixTTypedEntity` | Entities that have this type as declaredType|

0 commit comments

Comments
 (0)