diff --git a/src/FAST-Java-Model/FASTJavaAnnotation.class.st b/src/FAST-Java-Model/FASTJavaAnnotation.class.st index 175e855..09befbd 100644 --- a/src/FAST-Java-Model/FASTJavaAnnotation.class.st +++ b/src/FAST-Java-Model/FASTJavaAnnotation.class.st @@ -51,7 +51,6 @@ FASTJavaAnnotation class >> annotation [ - ^ self ] { #category : 'adding' } @@ -78,13 +77,6 @@ FASTJavaAnnotation >> elements: anObject [ elements value: anObject ] -{ #category : 'navigation' } -FASTJavaAnnotation >> elementsGroup [ - - - ^ MooseSpecializedGroup withAll: self elements asSet -] - { #category : 'testing' } FASTJavaAnnotation >> isAnnotation [ diff --git a/src/FAST-Java-Model/FASTJavaArrayAccess.class.st b/src/FAST-Java-Model/FASTJavaArrayAccess.class.st index 9c59c5e..0f6efaa 100644 --- a/src/FAST-Java-Model/FASTJavaArrayAccess.class.st +++ b/src/FAST-Java-Model/FASTJavaArrayAccess.class.st @@ -35,7 +35,7 @@ liste[i] | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableAssignmentOwner` | `FASTJavaTAssignable` | `variable` | `FASTJavaTWithAssignable` | The owner of the assignment| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -75,7 +75,6 @@ FASTJavaArrayAccess class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -102,13 +101,6 @@ FASTJavaArrayAccess >> array: anObject [ anObject javaArrayArrayAccessOwner: self ] ] -{ #category : 'navigation' } -FASTJavaArrayAccess >> arrayGroup [ - - - ^ MooseSpecializedGroup with: self array -] - { #category : 'accessing' } FASTJavaArrayAccess >> expression [ "Relation named: #expression type: #FASTTExpression opposite: #javaArrayAccessOwner" @@ -133,13 +125,6 @@ FASTJavaArrayAccess >> expression: anObject [ anObject javaArrayAccessOwner: self ] ] -{ #category : 'navigation' } -FASTJavaArrayAccess >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaArrayAccess >> isArrayAccess [ diff --git a/src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st b/src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st index b52e645..1e7168f 100644 --- a/src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st +++ b/src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st @@ -32,7 +32,7 @@ I represent an array as argument of an annotationExpression | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -73,7 +73,6 @@ FASTJavaArrayAnnotationElement class >> annotation [ - ^ self ] { #category : 'adding' } @@ -105,10 +104,3 @@ FASTJavaArrayAnnotationElement >> values: anObject [ values value: anObject ] - -{ #category : 'navigation' } -FASTJavaArrayAnnotationElement >> valuesGroup [ - - - ^ MooseSpecializedGroup withAll: self values asSet -] diff --git a/src/FAST-Java-Model/FASTJavaArrayInitializer.class.st b/src/FAST-Java-Model/FASTJavaArrayInitializer.class.st index 6a082dc..9f1a9bd 100644 --- a/src/FAST-Java-Model/FASTJavaArrayInitializer.class.st +++ b/src/FAST-Java-Model/FASTJavaArrayInitializer.class.st @@ -41,7 +41,7 @@ My initializers are | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -79,7 +79,6 @@ FASTJavaArrayInitializer class >> annotation [ - ^ self ] { #category : 'adding' } @@ -107,13 +106,6 @@ FASTJavaArrayInitializer >> initializers: anObject [ self initializers value: anObject ] -{ #category : 'navigation' } -FASTJavaArrayInitializer >> initializersGroup [ - - - ^ MooseSpecializedGroup withAll: self initializers asSet -] - { #category : 'testing' } FASTJavaArrayInitializer >> isArrayInitializer [ diff --git a/src/FAST-Java-Model/FASTJavaArrayTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaArrayTypeExpression.class.st index 2d13638..e4c1880 100644 --- a/src/FAST-Java-Model/FASTJavaArrayTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaArrayTypeExpression.class.st @@ -26,7 +26,6 @@ FASTJavaArrayTypeExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -53,13 +52,6 @@ FASTJavaArrayTypeExpression >> baseType: anObject [ anObject javaArrayTypeNameOwner: self ] ] -{ #category : 'navigation' } -FASTJavaArrayTypeExpression >> baseTypeGroup [ - - - ^ MooseSpecializedGroup with: self baseType -] - { #category : 'testing' } FASTJavaArrayTypeExpression >> isArrayTypeExpression [ diff --git a/src/FAST-Java-Model/FASTJavaAssertStatement.class.st b/src/FAST-Java-Model/FASTJavaAssertStatement.class.st index 93bb365..27e60bb 100644 --- a/src/FAST-Java-Model/FASTJavaAssertStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaAssertStatement.class.st @@ -54,7 +54,6 @@ FASTJavaAssertStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -81,13 +80,6 @@ FASTJavaAssertStatement >> condition: anObject [ anObject assertConditionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaAssertStatement >> conditionGroup [ - - - ^ MooseSpecializedGroup with: self condition -] - { #category : 'accessing' } FASTJavaAssertStatement >> message [ "Relation named: #message type: #FASTTExpression opposite: #javaStringAssertStatementOwner" @@ -111,10 +103,3 @@ FASTJavaAssertStatement >> message: anObject [ self attributeAt: #message put: anObject. anObject javaStringAssertStatementOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaAssertStatement >> messageGroup [ - - - ^ MooseSpecializedGroup with: self message -] diff --git a/src/FAST-Java-Model/FASTJavaAssignmentExpression.class.st b/src/FAST-Java-Model/FASTJavaAssignmentExpression.class.st index c46920d..2be806e 100644 --- a/src/FAST-Java-Model/FASTJavaAssignmentExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaAssignmentExpression.class.st @@ -34,7 +34,7 @@ Contains a referances to an assignee assignee and the expression that's being as | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -78,7 +78,6 @@ FASTJavaAssignmentExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -105,13 +104,6 @@ FASTJavaAssignmentExpression >> expression: anObject [ anObject javaAssignmentExpressionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaAssignmentExpression >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaAssignmentExpression >> isAssignmentExpression [ diff --git a/src/FAST-Java-Model/FASTJavaBooleanLiteral.class.st b/src/FAST-Java-Model/FASTJavaBooleanLiteral.class.st index a734289..9dcb381 100644 --- a/src/FAST-Java-Model/FASTJavaBooleanLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaBooleanLiteral.class.st @@ -30,7 +30,7 @@ I represent a boolean literal node. | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -64,5 +64,4 @@ FASTJavaBooleanLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaBooleanTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaBooleanTypeExpression.class.st index b82eed7..f2e1b67 100644 --- a/src/FAST-Java-Model/FASTJavaBooleanTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaBooleanTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaBooleanTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaBreakStatement.class.st b/src/FAST-Java-Model/FASTJavaBreakStatement.class.st index fdc4784..7e9ef8d 100644 --- a/src/FAST-Java-Model/FASTJavaBreakStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaBreakStatement.class.st @@ -41,7 +41,6 @@ FASTJavaBreakStatement class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaByteTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaByteTypeExpression.class.st index bbc1855..c8f33a1 100644 --- a/src/FAST-Java-Model/FASTJavaByteTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaByteTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaByteTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaCaseStatement.class.st b/src/FAST-Java-Model/FASTJavaCaseStatement.class.st index bc17991..3d3ba65 100644 --- a/src/FAST-Java-Model/FASTJavaCaseStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaCaseStatement.class.st @@ -7,7 +7,7 @@ case part of switch statement ### Parents | Relation | Origin | Opposite | Type | Comment | |---| -| `fastBehaviouralParent` | `FASTTStatementBlock` | `statementBlock` | `FASTTBehaviouralEntity` | Behavioural entity containing the statement block.| +| `fastBehaviouralParent` | `FASTTStatementBlock` | `statementBlock` | `FASTTWithStatements` | Behavioural entity containing the statement block.| | `forIncrementorOwner` | `FASTTStatement` | `incrementor` | `FASTJavaForStatement` | I am the incrementor of the for| | `forIninitializerOwner` | `FASTTStatement` | `initializer` | `FASTJavaForStatement` | I am the initializer of the for| | `ifElsePartOwner` | `FASTTStatement` | `elsePart` | `FASTJavaIfStatement` | The if owner (if possible)| @@ -53,7 +53,6 @@ FASTJavaCaseStatement class >> annotation [ - ^ self ] { #category : 'testing' } @@ -79,10 +78,3 @@ FASTJavaCaseStatement >> javaCaseStatementSwitchOwner: anObject [ javaCaseStatementSwitchOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaCaseStatement >> javaCaseStatementSwitchOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaCaseStatementSwitchOwner -] diff --git a/src/FAST-Java-Model/FASTJavaCastExpression.class.st b/src/FAST-Java-Model/FASTJavaCastExpression.class.st index 51276a9..4e54d52 100644 --- a/src/FAST-Java-Model/FASTJavaCastExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaCastExpression.class.st @@ -30,7 +30,7 @@ I represent a cast expression, e.g. `(int) 0.5` | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -73,7 +73,6 @@ FASTJavaCastExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -100,13 +99,6 @@ FASTJavaCastExpression >> expression: anObject [ anObject javaCastExpressionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaCastExpression >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaCastExpression >> isCastExpression [ @@ -129,10 +121,3 @@ FASTJavaCastExpression >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaCastExpression >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaCatchPartStatement.class.st b/src/FAST-Java-Model/FASTJavaCatchPartStatement.class.st index b4dd345..713d2fa 100644 --- a/src/FAST-Java-Model/FASTJavaCatchPartStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaCatchPartStatement.class.st @@ -55,7 +55,6 @@ FASTJavaCatchPartStatement class >> annotation [ - ^ self ] { #category : 'adding' } @@ -80,13 +79,6 @@ FASTJavaCatchPartStatement >> body: anObject [ body := anObject ] -{ #category : 'navigation' } -FASTJavaCatchPartStatement >> bodyGroup [ - - - ^ MooseSpecializedGroup with: self body -] - { #category : 'accessing' } FASTJavaCatchPartStatement >> catchedTypes [ "Relation named: #catchedTypes type: #FASTJavaTypeExpression opposite: #catchOwner" @@ -104,13 +96,6 @@ FASTJavaCatchPartStatement >> catchedTypes: anObject [ catchedTypes value: anObject ] -{ #category : 'navigation' } -FASTJavaCatchPartStatement >> catchedTypesGroup [ - - - ^ MooseSpecializedGroup withAll: self catchedTypes asSet -] - { #category : 'testing' } FASTJavaCatchPartStatement >> isCatchPartStatement [ @@ -134,13 +119,6 @@ FASTJavaCatchPartStatement >> parameter: anObject [ parameter := anObject ] -{ #category : 'navigation' } -FASTJavaCatchPartStatement >> parameterGroup [ - - - ^ MooseSpecializedGroup with: self parameter -] - { #category : 'accessing' } FASTJavaCatchPartStatement >> tryOwner [ "Relation named: #tryOwner type: #FASTJavaTryCatchStatement opposite: #catches" @@ -157,10 +135,3 @@ FASTJavaCatchPartStatement >> tryOwner: anObject [ tryOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaCatchPartStatement >> tryOwnerGroup [ - - - ^ MooseSpecializedGroup with: self tryOwner -] diff --git a/src/FAST-Java-Model/FASTJavaCharTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaCharTypeExpression.class.st index d077b45..4fd31ac 100644 --- a/src/FAST-Java-Model/FASTJavaCharTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaCharTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaCharTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaCharacterLiteral.class.st b/src/FAST-Java-Model/FASTJavaCharacterLiteral.class.st index 66d3881..ad79e03 100644 --- a/src/FAST-Java-Model/FASTJavaCharacterLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaCharacterLiteral.class.st @@ -35,7 +35,7 @@ char c = 'a'; | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -69,5 +69,4 @@ FASTJavaCharacterLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaClassDeclaration.class.st b/src/FAST-Java-Model/FASTJavaClassDeclaration.class.st index 43b2281..09e757f 100644 --- a/src/FAST-Java-Model/FASTJavaClassDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaClassDeclaration.class.st @@ -73,7 +73,6 @@ FASTJavaClassDeclaration class >> annotation [ - ^ self ] { #category : 'adding' } @@ -99,13 +98,6 @@ FASTJavaClassDeclaration >> compilationUnit: anObject [ compilationUnit := anObject ] -{ #category : 'navigation' } -FASTJavaClassDeclaration >> compilationUnitGroup [ - - - ^ MooseSpecializedGroup with: self compilationUnit -] - { #category : 'accessing' } FASTJavaClassDeclaration >> interfaces [ "Relation named: #interfaces type: #FASTJavaTypeExpression opposite: #javaClassDeclarationInterfaceOwner" @@ -123,13 +115,6 @@ FASTJavaClassDeclaration >> interfaces: anObject [ interfaces value: anObject ] -{ #category : 'navigation' } -FASTJavaClassDeclaration >> interfacesGroup [ - - - ^ MooseSpecializedGroup withAll: self interfaces asSet -] - { #category : 'testing' } FASTJavaClassDeclaration >> isClassDeclaration [ @@ -152,10 +137,3 @@ FASTJavaClassDeclaration >> superclass: anObject [ superclass := anObject ] - -{ #category : 'navigation' } -FASTJavaClassDeclaration >> superclassGroup [ - - - ^ MooseSpecializedGroup with: self superclass -] diff --git a/src/FAST-Java-Model/FASTJavaClassProperty.class.st b/src/FAST-Java-Model/FASTJavaClassProperty.class.st index bb3651a..ab6d6bd 100644 --- a/src/FAST-Java-Model/FASTJavaClassProperty.class.st +++ b/src/FAST-Java-Model/FASTJavaClassProperty.class.st @@ -75,7 +75,6 @@ FASTJavaClassProperty class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -115,10 +114,3 @@ FASTJavaClassProperty >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaClassProperty >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaClassTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaClassTypeExpression.class.st index 8aefb5d..4b6d709 100644 --- a/src/FAST-Java-Model/FASTJavaClassTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaClassTypeExpression.class.st @@ -40,7 +40,6 @@ FASTJavaClassTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } @@ -67,13 +66,6 @@ FASTJavaClassTypeExpression >> javaMethodThrowsOwner: anObject [ javaMethodThrowsOwner := anObject ] -{ #category : 'navigation' } -FASTJavaClassTypeExpression >> javaMethodThrowsOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaMethodThrowsOwner -] - { #category : 'accessing' } FASTJavaClassTypeExpression >> typeName [ "Relation named: #typeName type: #FASTJavaTypeName opposite: #javaTypeNameTypeExpressionOwner" @@ -90,13 +82,6 @@ FASTJavaClassTypeExpression >> typeName: anObject [ typeName := anObject ] -{ #category : 'navigation' } -FASTJavaClassTypeExpression >> typeNameGroup [ - - - ^ MooseSpecializedGroup with: self typeName -] - { #category : 'accessing' } FASTJavaClassTypeExpression >> typeParameterOwner [ "Relation named: #typeParameterOwner type: #FASTJavaTypeParameterExpression opposite: #types" @@ -113,10 +98,3 @@ FASTJavaClassTypeExpression >> typeParameterOwner: anObject [ typeParameterOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaClassTypeExpression >> typeParameterOwnerGroup [ - - - ^ MooseSpecializedGroup with: self typeParameterOwner -] diff --git a/src/FAST-Java-Model/FASTJavaComment.class.st b/src/FAST-Java-Model/FASTJavaComment.class.st index 869bda5..d10f1f7 100644 --- a/src/FAST-Java-Model/FASTJavaComment.class.st +++ b/src/FAST-Java-Model/FASTJavaComment.class.st @@ -34,5 +34,4 @@ FASTJavaComment class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaCompilationUnit.class.st b/src/FAST-Java-Model/FASTJavaCompilationUnit.class.st index 6e1326f..f321ac8 100644 --- a/src/FAST-Java-Model/FASTJavaCompilationUnit.class.st +++ b/src/FAST-Java-Model/FASTJavaCompilationUnit.class.st @@ -46,7 +46,6 @@ FASTJavaCompilationUnit class >> annotation [ - ^ self ] { #category : 'adding' } @@ -90,13 +89,6 @@ FASTJavaCompilationUnit >> classDeclarations: anObject [ classDeclarations value: anObject ] -{ #category : 'navigation' } -FASTJavaCompilationUnit >> classDeclarationsGroup [ - - - ^ MooseSpecializedGroup withAll: self classDeclarations asSet -] - { #category : 'accessing' } FASTJavaCompilationUnit >> enumDeclarations [ "Relation named: #enumDeclarations type: #FASTJavaEnumDeclaration opposite: #compilationUnit" @@ -114,13 +106,6 @@ FASTJavaCompilationUnit >> enumDeclarations: anObject [ enumDeclarations value: anObject ] -{ #category : 'navigation' } -FASTJavaCompilationUnit >> enumDeclarationsGroup [ - - - ^ MooseSpecializedGroup withAll: self enumDeclarations asSet -] - { #category : 'accessing' } FASTJavaCompilationUnit >> importDeclarations [ "Relation named: #importDeclarations type: #FASTJavaImportDeclaration opposite: #compilationUnit" @@ -138,13 +123,6 @@ FASTJavaCompilationUnit >> importDeclarations: anObject [ importDeclarations value: anObject ] -{ #category : 'navigation' } -FASTJavaCompilationUnit >> importDeclarationsGroup [ - - - ^ MooseSpecializedGroup withAll: self importDeclarations asSet -] - { #category : 'accessing' } FASTJavaCompilationUnit >> interfaceDeclarations [ "Relation named: #interfaceDeclarations type: #FASTJavaInterfaceDeclaration opposite: #compilationUnit" @@ -162,13 +140,6 @@ FASTJavaCompilationUnit >> interfaceDeclarations: anObject [ interfaceDeclarations value: anObject ] -{ #category : 'navigation' } -FASTJavaCompilationUnit >> interfaceDeclarationsGroup [ - - - ^ MooseSpecializedGroup withAll: self interfaceDeclarations asSet -] - { #category : 'testing' } FASTJavaCompilationUnit >> isCompilationUnit [ @@ -191,10 +162,3 @@ FASTJavaCompilationUnit >> packageDeclaration: anObject [ packageDeclaration := anObject ] - -{ #category : 'navigation' } -FASTJavaCompilationUnit >> packageDeclarationGroup [ - - - ^ MooseSpecializedGroup with: self packageDeclaration -] diff --git a/src/FAST-Java-Model/FASTJavaConditionalExpression.class.st b/src/FAST-Java-Model/FASTJavaConditionalExpression.class.st index 1768346..5bc93f1 100644 --- a/src/FAST-Java-Model/FASTJavaConditionalExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaConditionalExpression.class.st @@ -34,7 +34,7 @@ ex: | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -75,7 +75,6 @@ FASTJavaConditionalExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -102,13 +101,6 @@ FASTJavaConditionalExpression >> condition: anObject [ anObject conditionalConditionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaConditionalExpression >> conditionGroup [ - - - ^ MooseSpecializedGroup with: self condition -] - { #category : 'accessing' } FASTJavaConditionalExpression >> elsePart [ "Relation named: #elsePart type: #FASTTExpression opposite: #conditionalElsePartOwner" @@ -133,13 +125,6 @@ FASTJavaConditionalExpression >> elsePart: anObject [ anObject conditionalElsePartOwner: self ] ] -{ #category : 'navigation' } -FASTJavaConditionalExpression >> elsePartGroup [ - - - ^ MooseSpecializedGroup with: self elsePart -] - { #category : 'testing' } FASTJavaConditionalExpression >> isConditionalExpression [ @@ -170,10 +155,3 @@ FASTJavaConditionalExpression >> thenPart: anObject [ self attributeAt: #thenPart put: anObject. anObject conditionalThenPartOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaConditionalExpression >> thenPartGroup [ - - - ^ MooseSpecializedGroup with: self thenPart -] diff --git a/src/FAST-Java-Model/FASTJavaContinueStatement.class.st b/src/FAST-Java-Model/FASTJavaContinueStatement.class.st index 51999e7..5842ac5 100644 --- a/src/FAST-Java-Model/FASTJavaContinueStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaContinueStatement.class.st @@ -41,7 +41,6 @@ FASTJavaContinueStatement class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaDefaultCaseStatement.class.st b/src/FAST-Java-Model/FASTJavaDefaultCaseStatement.class.st index 0f9c2d0..cbb6fa7 100644 --- a/src/FAST-Java-Model/FASTJavaDefaultCaseStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaDefaultCaseStatement.class.st @@ -21,7 +21,6 @@ FASTJavaDefaultCaseStatement class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaDoWhileStatement.class.st b/src/FAST-Java-Model/FASTJavaDoWhileStatement.class.st index c7735dc..2eac900 100644 --- a/src/FAST-Java-Model/FASTJavaDoWhileStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaDoWhileStatement.class.st @@ -24,7 +24,7 @@ do { | Relation | Origin | Opposite | Type | Comment | |---| | `body` | `FASTTLoopStatement` | `parentLoopStatement` | `FASTTStatement` | The body of the loop| -| `condition` | `FASTTConditionalStatement` | `parentConditionalStatement` | `FASTTExpression` | The boolean condition tested| +| `condition` | `FASTTWithCondition` | `parentConditional` | `FASTTExpression` | The boolean condition tested| ## Properties @@ -52,7 +52,6 @@ FASTJavaDoWhileStatement class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaDoubleLiteral.class.st b/src/FAST-Java-Model/FASTJavaDoubleLiteral.class.st index 5e35ca1..1b4b1e6 100644 --- a/src/FAST-Java-Model/FASTJavaDoubleLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaDoubleLiteral.class.st @@ -36,7 +36,7 @@ double d2 = 12.3d; | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -70,5 +70,4 @@ FASTJavaDoubleLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaDoubleTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaDoubleTypeExpression.class.st index e328018..ff29857 100644 --- a/src/FAST-Java-Model/FASTJavaDoubleTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaDoubleTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaDoubleTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaEmptyDimExpression.class.st b/src/FAST-Java-Model/FASTJavaEmptyDimExpression.class.st index 6010525..2272bc5 100644 --- a/src/FAST-Java-Model/FASTJavaEmptyDimExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaEmptyDimExpression.class.st @@ -32,7 +32,7 @@ A node representing an empty expression when creating an array, for example: | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -65,7 +65,6 @@ FASTJavaEmptyDimExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaEmptyMethodDeclaration.class.st b/src/FAST-Java-Model/FASTJavaEmptyMethodDeclaration.class.st index 354f80c..f452c58 100644 --- a/src/FAST-Java-Model/FASTJavaEmptyMethodDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaEmptyMethodDeclaration.class.st @@ -26,7 +26,6 @@ FASTJavaEmptyMethodDeclaration class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaEntity.class.st b/src/FAST-Java-Model/FASTJavaEntity.class.st index e94792a..e58955c 100644 --- a/src/FAST-Java-Model/FASTJavaEntity.class.st +++ b/src/FAST-Java-Model/FASTJavaEntity.class.st @@ -42,7 +42,6 @@ FASTJavaEntity class >> annotation [ - ^ self ] { #category : 'testing' } @@ -664,10 +663,3 @@ FASTJavaEntity >> javaLambdaExpressionOwner: anObject [ javaLambdaExpressionOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaEntity >> javaLambdaExpressionOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaLambdaExpressionOwner -] diff --git a/src/FAST-Java-Model/FASTJavaEnumConstant.class.st b/src/FAST-Java-Model/FASTJavaEnumConstant.class.st index 49881fa..55bea9d 100644 --- a/src/FAST-Java-Model/FASTJavaEnumConstant.class.st +++ b/src/FAST-Java-Model/FASTJavaEnumConstant.class.st @@ -27,7 +27,6 @@ FASTJavaEnumConstant class >> annotation [ - ^ self ] { #category : 'testing' } @@ -53,10 +52,3 @@ FASTJavaEnumConstant >> parentEnum: anObject [ parentEnum := anObject ] - -{ #category : 'navigation' } -FASTJavaEnumConstant >> parentEnumGroup [ - - - ^ MooseSpecializedGroup with: self parentEnum -] diff --git a/src/FAST-Java-Model/FASTJavaEnumDeclaration.class.st b/src/FAST-Java-Model/FASTJavaEnumDeclaration.class.st index bfbac27..00b064f 100644 --- a/src/FAST-Java-Model/FASTJavaEnumDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaEnumDeclaration.class.st @@ -75,7 +75,6 @@ FASTJavaEnumDeclaration class >> annotation [ - ^ self ] { #category : 'adding' } @@ -107,13 +106,6 @@ FASTJavaEnumDeclaration >> compilationUnit: anObject [ compilationUnit := anObject ] -{ #category : 'navigation' } -FASTJavaEnumDeclaration >> compilationUnitGroup [ - - - ^ MooseSpecializedGroup with: self compilationUnit -] - { #category : 'accessing' } FASTJavaEnumDeclaration >> constants [ "Relation named: #constants type: #FASTJavaEnumConstant opposite: #parentEnum" @@ -131,13 +123,6 @@ FASTJavaEnumDeclaration >> constants: anObject [ constants value: anObject ] -{ #category : 'navigation' } -FASTJavaEnumDeclaration >> constantsGroup [ - - - ^ MooseSpecializedGroup withAll: self constants asSet -] - { #category : 'accessing' } FASTJavaEnumDeclaration >> interfaces [ "Relation named: #interfaces type: #FASTJavaTypeExpression opposite: #javaEnumDeclarationInterfaceOwner" @@ -155,13 +140,6 @@ FASTJavaEnumDeclaration >> interfaces: anObject [ interfaces value: anObject ] -{ #category : 'navigation' } -FASTJavaEnumDeclaration >> interfacesGroup [ - - - ^ MooseSpecializedGroup withAll: self interfaces asSet -] - { #category : 'testing' } FASTJavaEnumDeclaration >> isEnumDeclaration [ diff --git a/src/FAST-Java-Model/FASTJavaExpressionStatement.class.st b/src/FAST-Java-Model/FASTJavaExpressionStatement.class.st index a220498..e2f5040 100644 --- a/src/FAST-Java-Model/FASTJavaExpressionStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaExpressionStatement.class.st @@ -44,5 +44,4 @@ FASTJavaExpressionStatement class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaFieldAccess.class.st b/src/FAST-Java-Model/FASTJavaFieldAccess.class.st index f01dc86..60328ed 100644 --- a/src/FAST-Java-Model/FASTJavaFieldAccess.class.st +++ b/src/FAST-Java-Model/FASTJavaFieldAccess.class.st @@ -31,7 +31,7 @@ A FASTJavaFieldAccess corresponds to an access to an instance variable (field) | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableAssignmentOwner` | `FASTJavaTAssignable` | `variable` | `FASTJavaTWithAssignable` | The owner of the assignment| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -74,7 +74,6 @@ FASTJavaFieldAccess class >> annotation [ - ^ self ] { #category : 'accessing' } diff --git a/src/FAST-Java-Model/FASTJavaFloatLiteral.class.st b/src/FAST-Java-Model/FASTJavaFloatLiteral.class.st index ff9c447..7692098 100644 --- a/src/FAST-Java-Model/FASTJavaFloatLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaFloatLiteral.class.st @@ -35,7 +35,7 @@ float f = 12.3f; | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -69,5 +69,4 @@ FASTJavaFloatLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaFloatTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaFloatTypeExpression.class.st index b358a09..cea35de 100644 --- a/src/FAST-Java-Model/FASTJavaFloatTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaFloatTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaFloatTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaForEachStatement.class.st b/src/FAST-Java-Model/FASTJavaForEachStatement.class.st index de4a87b..2e79e80 100644 --- a/src/FAST-Java-Model/FASTJavaForEachStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaForEachStatement.class.st @@ -58,7 +58,6 @@ FASTJavaForEachStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -77,13 +76,6 @@ FASTJavaForEachStatement >> fieldname: anObject [ fieldname := anObject ] -{ #category : 'navigation' } -FASTJavaForEachStatement >> fieldnameGroup [ - - - ^ MooseSpecializedGroup with: self fieldname -] - { #category : 'testing' } FASTJavaForEachStatement >> isForEachStatement [ @@ -115,13 +107,6 @@ FASTJavaForEachStatement >> list: anObject [ anObject javaForEachStatementOwner: self ] ] -{ #category : 'navigation' } -FASTJavaForEachStatement >> listGroup [ - - - ^ MooseSpecializedGroup with: self list -] - { #category : 'accessing' } FASTJavaForEachStatement >> type [ "Relation named: #type type: #FASTJavaTypeExpression opposite: #javaForEachStatementTypeOwner" @@ -137,10 +122,3 @@ FASTJavaForEachStatement >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaForEachStatement >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaForStatement.class.st b/src/FAST-Java-Model/FASTJavaForStatement.class.st index 48387ad..41cf1ed 100644 --- a/src/FAST-Java-Model/FASTJavaForStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaForStatement.class.st @@ -24,7 +24,7 @@ for(_;_;_) { | Relation | Origin | Opposite | Type | Comment | |---| | `body` | `FASTTLoopStatement` | `parentLoopStatement` | `FASTTStatement` | The body of the loop| -| `condition` | `FASTTConditionalStatement` | `parentConditionalStatement` | `FASTTExpression` | The boolean condition tested| +| `condition` | `FASTTWithCondition` | `parentConditional` | `FASTTExpression` | The boolean condition tested| | `incrementor` | `FASTJavaForStatement` | `forIncrementorOwner` | `FASTTStatement` | Expression evaluated at the end of each loop| | `initializer` | `FASTJavaForStatement` | `forIninitializerOwner` | `FASTTStatement` | Expression used at initialization phase of a for loop| @@ -54,7 +54,6 @@ FASTJavaForStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -81,13 +80,6 @@ FASTJavaForStatement >> incrementor: anObject [ anObject forIncrementorOwner: self ] ] -{ #category : 'navigation' } -FASTJavaForStatement >> incrementorGroup [ - - - ^ MooseSpecializedGroup with: self incrementor -] - { #category : 'accessing' } FASTJavaForStatement >> initializer [ "Relation named: #initializer type: #FASTTStatement opposite: #forIninitializerOwner" @@ -112,13 +104,6 @@ FASTJavaForStatement >> initializer: anObject [ anObject forIninitializerOwner: self ] ] -{ #category : 'navigation' } -FASTJavaForStatement >> initializerGroup [ - - - ^ MooseSpecializedGroup with: self initializer -] - { #category : 'testing' } FASTJavaForStatement >> isForStatement [ diff --git a/src/FAST-Java-Model/FASTJavaIdentifier.class.st b/src/FAST-Java-Model/FASTJavaIdentifier.class.st index c439fef..2c2dc9c 100644 --- a/src/FAST-Java-Model/FASTJavaIdentifier.class.st +++ b/src/FAST-Java-Model/FASTJavaIdentifier.class.st @@ -32,7 +32,6 @@ FASTJavaIdentifier class >> annotation [ - ^ self ] { #category : 'testing' } @@ -59,10 +58,3 @@ FASTJavaIdentifier >> javaForEachStatementFieldNameOwner: anObject [ javaForEachStatementFieldNameOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaIdentifier >> javaForEachStatementFieldNameOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaForEachStatementFieldNameOwner -] diff --git a/src/FAST-Java-Model/FASTJavaIfStatement.class.st b/src/FAST-Java-Model/FASTJavaIfStatement.class.st index e158b49..7d6ae5a 100644 --- a/src/FAST-Java-Model/FASTJavaIfStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaIfStatement.class.st @@ -25,7 +25,7 @@ if(...) { ### Children | Relation | Origin | Opposite | Type | Comment | |---| -| `condition` | `FASTTConditionalStatement` | `parentConditionalStatement` | `FASTTExpression` | The boolean condition tested| +| `condition` | `FASTTWithCondition` | `parentConditional` | `FASTTExpression` | The boolean condition tested| | `elsePart` | `FASTJavaIfStatement` | `ifElsePartOwner` | `FASTTStatement` | else part| | `thenPart` | `FASTJavaIfStatement` | `ifThenPartOwner` | `FASTTStatement` | then part| @@ -55,7 +55,6 @@ FASTJavaIfStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -82,13 +81,6 @@ FASTJavaIfStatement >> elsePart: anObject [ anObject ifElsePartOwner: self ] ] -{ #category : 'navigation' } -FASTJavaIfStatement >> elsePartGroup [ - - - ^ MooseSpecializedGroup with: self elsePart -] - { #category : 'testing' } FASTJavaIfStatement >> isIfStatement [ @@ -119,10 +111,3 @@ FASTJavaIfStatement >> thenPart: anObject [ self attributeAt: #thenPart put: anObject. anObject ifThenPartOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaIfStatement >> thenPartGroup [ - - - ^ MooseSpecializedGroup with: self thenPart -] diff --git a/src/FAST-Java-Model/FASTJavaImportDeclaration.class.st b/src/FAST-Java-Model/FASTJavaImportDeclaration.class.st index 5531569..a3ef975 100644 --- a/src/FAST-Java-Model/FASTJavaImportDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaImportDeclaration.class.st @@ -47,7 +47,6 @@ FASTJavaImportDeclaration class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -67,13 +66,6 @@ FASTJavaImportDeclaration >> compilationUnit: anObject [ compilationUnit := anObject ] -{ #category : 'navigation' } -FASTJavaImportDeclaration >> compilationUnitGroup [ - - - ^ MooseSpecializedGroup with: self compilationUnit -] - { #category : 'testing' } FASTJavaImportDeclaration >> isImportDeclaration [ diff --git a/src/FAST-Java-Model/FASTJavaInfixOperation.class.st b/src/FAST-Java-Model/FASTJavaInfixOperation.class.st index 8ac94f7..4430c87 100644 --- a/src/FAST-Java-Model/FASTJavaInfixOperation.class.st +++ b/src/FAST-Java-Model/FASTJavaInfixOperation.class.st @@ -37,7 +37,7 @@ ex: | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -81,7 +81,6 @@ FASTJavaInfixOperation class >> annotation [ - ^ self ] { #category : 'testing' } @@ -115,13 +114,6 @@ FASTJavaInfixOperation >> leftOperand: anObject [ anObject infixOperationLeftOperandOwner: self ] ] -{ #category : 'navigation' } -FASTJavaInfixOperation >> leftOperandGroup [ - - - ^ MooseSpecializedGroup with: self leftOperand -] - { #category : 'accessing' } FASTJavaInfixOperation >> operator [ @@ -160,10 +152,3 @@ FASTJavaInfixOperation >> rightOperand: anObject [ self attributeAt: #rightOperand put: anObject. anObject infixOperationRightOperandOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaInfixOperation >> rightOperandGroup [ - - - ^ MooseSpecializedGroup with: self rightOperand -] diff --git a/src/FAST-Java-Model/FASTJavaInitializer.class.st b/src/FAST-Java-Model/FASTJavaInitializer.class.st index 80f8405..8495611 100644 --- a/src/FAST-Java-Model/FASTJavaInitializer.class.st +++ b/src/FAST-Java-Model/FASTJavaInitializer.class.st @@ -59,7 +59,6 @@ FASTJavaInitializer class >> annotation [ - ^ self ] { #category : 'testing' } @@ -107,10 +106,3 @@ FASTJavaInitializer >> statementBlock: anObject [ self attributeAt: #statementBlock put: anObject. anObject javaInitializerOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaInitializer >> statementBlockGroup [ - - - ^ MooseSpecializedGroup with: self statementBlock -] diff --git a/src/FAST-Java-Model/FASTJavaIntTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaIntTypeExpression.class.st index ea058c9..1a608ca 100644 --- a/src/FAST-Java-Model/FASTJavaIntTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaIntTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaIntTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaIntegerLiteral.class.st b/src/FAST-Java-Model/FASTJavaIntegerLiteral.class.st index 5b3629e..9028924 100644 --- a/src/FAST-Java-Model/FASTJavaIntegerLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaIntegerLiteral.class.st @@ -30,7 +30,7 @@ I represent an integer literal node. | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -64,5 +64,4 @@ FASTJavaIntegerLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaInterfaceDeclaration.class.st b/src/FAST-Java-Model/FASTJavaInterfaceDeclaration.class.st index d2b69c7..3fe59fd 100644 --- a/src/FAST-Java-Model/FASTJavaInterfaceDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaInterfaceDeclaration.class.st @@ -72,7 +72,6 @@ FASTJavaInterfaceDeclaration class >> annotation [ - ^ self ] { #category : 'adding' } @@ -98,13 +97,6 @@ FASTJavaInterfaceDeclaration >> compilationUnit: anObject [ compilationUnit := anObject ] -{ #category : 'navigation' } -FASTJavaInterfaceDeclaration >> compilationUnitGroup [ - - - ^ MooseSpecializedGroup with: self compilationUnit -] - { #category : 'accessing' } FASTJavaInterfaceDeclaration >> interfaces [ "Relation named: #interfaces type: #FASTJavaTypeExpression opposite: #javaInterfaceDeclarationInterfaceOwner" @@ -122,13 +114,6 @@ FASTJavaInterfaceDeclaration >> interfaces: anObject [ interfaces value: anObject ] -{ #category : 'navigation' } -FASTJavaInterfaceDeclaration >> interfacesGroup [ - - - ^ MooseSpecializedGroup withAll: self interfaces asSet -] - { #category : 'testing' } FASTJavaInterfaceDeclaration >> isInterfaceDeclaration [ diff --git a/src/FAST-Java-Model/FASTJavaLabeledCaseStatement.class.st b/src/FAST-Java-Model/FASTJavaLabeledCaseStatement.class.st index 90f0077..f19b494 100644 --- a/src/FAST-Java-Model/FASTJavaLabeledCaseStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaLabeledCaseStatement.class.st @@ -30,7 +30,6 @@ FASTJavaLabeledCaseStatement class >> annotation [ - ^ self ] { #category : 'testing' } @@ -63,10 +62,3 @@ FASTJavaLabeledCaseStatement >> label: anObject [ self attributeAt: #label put: anObject. anObject javaLabeledCaseStatementOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaLabeledCaseStatement >> labelGroup [ - - - ^ MooseSpecializedGroup with: self label -] diff --git a/src/FAST-Java-Model/FASTJavaLabeledStatement.class.st b/src/FAST-Java-Model/FASTJavaLabeledStatement.class.st index 1a028eb..1a7a77a 100644 --- a/src/FAST-Java-Model/FASTJavaLabeledStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaLabeledStatement.class.st @@ -48,7 +48,6 @@ FASTJavaLabeledStatement class >> annotation [ - ^ self ] { #category : 'testing' } @@ -96,10 +95,3 @@ FASTJavaLabeledStatement >> labeledStatement: anObject [ self attributeAt: #labeledStatement put: anObject. anObject labelStatementOwner: self ] ] - -{ #category : 'navigation' } -FASTJavaLabeledStatement >> labeledStatementGroup [ - - - ^ MooseSpecializedGroup with: self labeledStatement -] diff --git a/src/FAST-Java-Model/FASTJavaLambdaExpression.class.st b/src/FAST-Java-Model/FASTJavaLambdaExpression.class.st index 124162e..f8d2b2f 100644 --- a/src/FAST-Java-Model/FASTJavaLambdaExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaLambdaExpression.class.st @@ -30,7 +30,7 @@ I represent a lambda expression | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -72,7 +72,6 @@ FASTJavaLambdaExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -91,13 +90,6 @@ FASTJavaLambdaExpression >> expression: anObject [ expression := anObject ] -{ #category : 'navigation' } -FASTJavaLambdaExpression >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaLambdaExpression >> isLambdaExpression [ diff --git a/src/FAST-Java-Model/FASTJavaLiteral.class.st b/src/FAST-Java-Model/FASTJavaLiteral.class.st index 9bc8d9c..fc6af4f 100644 --- a/src/FAST-Java-Model/FASTJavaLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaLiteral.class.st @@ -30,5 +30,4 @@ FASTJavaLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaLongLiteral.class.st b/src/FAST-Java-Model/FASTJavaLongLiteral.class.st index 7bc8108..1e3827b 100644 --- a/src/FAST-Java-Model/FASTJavaLongLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaLongLiteral.class.st @@ -35,7 +35,7 @@ long l = 2147483648L; | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -69,5 +69,4 @@ FASTJavaLongLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaLongTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaLongTypeExpression.class.st index a73e591..4054bfb 100644 --- a/src/FAST-Java-Model/FASTJavaLongTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaLongTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaLongTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaMethodEntity.class.st b/src/FAST-Java-Model/FASTJavaMethodEntity.class.st index b8109bb..d9476c2 100644 --- a/src/FAST-Java-Model/FASTJavaMethodEntity.class.st +++ b/src/FAST-Java-Model/FASTJavaMethodEntity.class.st @@ -15,7 +15,7 @@ Represents a Java method |---| | `modifiers` | `FASTJavaTWithModifiers` | `javaModifierOwner` | `FASTJavaTModifier` | My modifiers| | `parameters` | `FASTTWithParameters` | `parameterOwner` | `FASTTVariableEntity` | My parameters| -| `statementBlock` | `FASTTBehaviouralEntity` | `fastBehaviouralParent` | `FASTTStatementBlock` | Statements block of the behavioural entity| +| `statementBlock` | `FASTTWithStatements` | `fastBehaviouralParent` | `FASTTStatementBlock` | Statements block of the behavioural entity| | `throws` | `FASTJavaMethodEntity` | `javaMethodThrowsOwner` | `FASTJavaClassTypeExpression` | The list of throws exception| | `type` | `FASTJavaMethodEntity` | `javaMethodTypeOwner` | `FASTJavaVariableExpression` | The type of the method| | `typeParameters` | `FASTJavaMethodEntity` | `javaMethodTypeParameterOwner` | `FASTJavaTypeParameterExpression` | The list of type parameter| @@ -58,7 +58,6 @@ FASTJavaMethodEntity class >> annotation [ - ^ self ] { #category : 'adding' } @@ -97,13 +96,6 @@ FASTJavaMethodEntity >> throws: anObject [ throws value: anObject ] -{ #category : 'navigation' } -FASTJavaMethodEntity >> throwsGroup [ - - - ^ MooseSpecializedGroup withAll: self throws asSet -] - { #category : 'accessing' } FASTJavaMethodEntity >> type [ "Relation named: #type type: #FASTJavaVariableExpression opposite: #javaMethodTypeOwner" @@ -120,13 +112,6 @@ FASTJavaMethodEntity >> type: anObject [ type := anObject ] -{ #category : 'navigation' } -FASTJavaMethodEntity >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] - { #category : 'accessing' } FASTJavaMethodEntity >> typeParameters [ "Relation named: #typeParameters type: #FASTJavaTypeParameterExpression opposite: #javaMethodTypeParameterOwner" @@ -143,10 +128,3 @@ FASTJavaMethodEntity >> typeParameters: anObject [ typeParameters value: anObject ] - -{ #category : 'navigation' } -FASTJavaMethodEntity >> typeParametersGroup [ - - - ^ MooseSpecializedGroup withAll: self typeParameters asSet -] diff --git a/src/FAST-Java-Model/FASTJavaMethodInvocation.class.st b/src/FAST-Java-Model/FASTJavaMethodInvocation.class.st index 425a0bb..2755b93 100644 --- a/src/FAST-Java-Model/FASTJavaMethodInvocation.class.st +++ b/src/FAST-Java-Model/FASTJavaMethodInvocation.class.st @@ -31,7 +31,7 @@ A node representing method invocation | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -73,5 +73,4 @@ FASTJavaMethodInvocation class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaMethodReference.class.st b/src/FAST-Java-Model/FASTJavaMethodReference.class.st index 5220eb6..e498827 100644 --- a/src/FAST-Java-Model/FASTJavaMethodReference.class.st +++ b/src/FAST-Java-Model/FASTJavaMethodReference.class.st @@ -31,7 +31,7 @@ I represent a method reference | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -73,7 +73,6 @@ FASTJavaMethodReference class >> annotation [ - ^ self ] { #category : 'testing' } @@ -98,10 +97,3 @@ FASTJavaMethodReference >> receiver: anObject [ receiver := anObject ] - -{ #category : 'navigation' } -FASTJavaMethodReference >> receiverGroup [ - - - ^ MooseSpecializedGroup with: self receiver -] diff --git a/src/FAST-Java-Model/FASTJavaModel.class.st b/src/FAST-Java-Model/FASTJavaModel.class.st index a2fbbcd..606daa6 100644 --- a/src/FAST-Java-Model/FASTJavaModel.class.st +++ b/src/FAST-Java-Model/FASTJavaModel.class.st @@ -16,7 +16,8 @@ FASTJavaModel class >> allSubmetamodelsPackagesNames [ { #category : 'meta' } FASTJavaModel class >> annotation [ - + + ] diff --git a/src/FAST-Java-Model/FASTJavaModifier.class.st b/src/FAST-Java-Model/FASTJavaModifier.class.st index b992390..096c769 100644 --- a/src/FAST-Java-Model/FASTJavaModifier.class.st +++ b/src/FAST-Java-Model/FASTJavaModifier.class.st @@ -55,7 +55,7 @@ for methods: | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -92,7 +92,6 @@ FASTJavaModifier class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaNewArray.class.st b/src/FAST-Java-Model/FASTJavaNewArray.class.st index 5751521..fa17f6d 100644 --- a/src/FAST-Java-Model/FASTJavaNewArray.class.st +++ b/src/FAST-Java-Model/FASTJavaNewArray.class.st @@ -29,7 +29,6 @@ FASTJavaNewArray class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -56,13 +55,6 @@ FASTJavaNewArray >> initializer: anObject [ anObject javaNewArrayInitialOwner: self ] ] -{ #category : 'navigation' } -FASTJavaNewArray >> initializerGroup [ - - - ^ MooseSpecializedGroup with: self initializer -] - { #category : 'testing' } FASTJavaNewArray >> isNewArray [ diff --git a/src/FAST-Java-Model/FASTJavaNewClassExpression.class.st b/src/FAST-Java-Model/FASTJavaNewClassExpression.class.st index 8bc87df..2178317 100644 --- a/src/FAST-Java-Model/FASTJavaNewClassExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaNewClassExpression.class.st @@ -42,7 +42,6 @@ FASTJavaNewClassExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaNewExpression.class.st b/src/FAST-Java-Model/FASTJavaNewExpression.class.st index 6fec464..24aef3d 100644 --- a/src/FAST-Java-Model/FASTJavaNewExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaNewExpression.class.st @@ -34,7 +34,7 @@ new Patate() | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -78,7 +78,6 @@ FASTJavaNewExpression class >> annotation [ - ^ self ] { #category : 'testing' } @@ -103,10 +102,3 @@ FASTJavaNewExpression >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaNewExpression >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaNullLiteral.class.st b/src/FAST-Java-Model/FASTJavaNullLiteral.class.st index fe30ef2..bb4c4c1 100644 --- a/src/FAST-Java-Model/FASTJavaNullLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaNullLiteral.class.st @@ -30,7 +30,7 @@ I represent a `null` literal node. | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -64,5 +64,4 @@ FASTJavaNullLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaOuterThis.class.st b/src/FAST-Java-Model/FASTJavaOuterThis.class.st index c92579d..492a694 100644 --- a/src/FAST-Java-Model/FASTJavaOuterThis.class.st +++ b/src/FAST-Java-Model/FASTJavaOuterThis.class.st @@ -34,7 +34,7 @@ hello(MyClass.this) | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -76,7 +76,6 @@ FASTJavaOuterThis class >> annotation [ - ^ self ] { #category : 'testing' } @@ -101,10 +100,3 @@ FASTJavaOuterThis >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaOuterThis >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaPackageDeclaration.class.st b/src/FAST-Java-Model/FASTJavaPackageDeclaration.class.st index 9a93f61..8403bbc 100644 --- a/src/FAST-Java-Model/FASTJavaPackageDeclaration.class.st +++ b/src/FAST-Java-Model/FASTJavaPackageDeclaration.class.st @@ -43,7 +43,6 @@ FASTJavaPackageDeclaration class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -64,13 +63,6 @@ FASTJavaPackageDeclaration >> compilationUnit: anObject [ compilationUnit := anObject ] -{ #category : 'navigation' } -FASTJavaPackageDeclaration >> compilationUnitGroup [ - - - ^ MooseSpecializedGroup with: self compilationUnit -] - { #category : 'testing' } FASTJavaPackageDeclaration >> isPackageDeclaration [ diff --git a/src/FAST-Java-Model/FASTJavaParameter.class.st b/src/FAST-Java-Model/FASTJavaParameter.class.st index 03d2832..5d7003a 100644 --- a/src/FAST-Java-Model/FASTJavaParameter.class.st +++ b/src/FAST-Java-Model/FASTJavaParameter.class.st @@ -33,7 +33,7 @@ I represent a parameter of a method declaration | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parameterOwner` | `FASTTVariableEntity` | `parameters` | `FASTTWithParameters` | parameterOwner| | `parentAssignmentExpression` | `FASTTVariableEntity` | `variable` | `FASTTAssignment` | Optional assignment to the variable| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -79,7 +79,6 @@ FASTJavaParameter class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -120,13 +119,6 @@ FASTJavaParameter >> type: anObject [ type := anObject ] -{ #category : 'navigation' } -FASTJavaParameter >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] - { #category : 'accessing' } FASTJavaParameter >> variable [ "Relation named: #variable type: #FASTJavaVariableExpression opposite: #javaParameterVariableOwner" @@ -142,10 +134,3 @@ FASTJavaParameter >> variable: anObject [ variable := anObject ] - -{ #category : 'navigation' } -FASTJavaParameter >> variableGroup [ - - - ^ MooseSpecializedGroup with: self variable -] diff --git a/src/FAST-Java-Model/FASTJavaPrimitiveTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaPrimitiveTypeExpression.class.st index d6795a4..542d331 100644 --- a/src/FAST-Java-Model/FASTJavaPrimitiveTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaPrimitiveTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaPrimitiveTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaQualifiedName.class.st b/src/FAST-Java-Model/FASTJavaQualifiedName.class.st index a356e92..58fe205 100644 --- a/src/FAST-Java-Model/FASTJavaQualifiedName.class.st +++ b/src/FAST-Java-Model/FASTJavaQualifiedName.class.st @@ -47,7 +47,6 @@ FASTJavaQualifiedName class >> annotation [ - ^ self ] { #category : 'testing' } @@ -73,13 +72,6 @@ FASTJavaQualifiedName >> namespace: anObject [ namespace := anObject ] -{ #category : 'navigation' } -FASTJavaQualifiedName >> namespaceGroup [ - - - ^ MooseSpecializedGroup with: self namespace -] - { #category : 'accessing' } FASTJavaQualifiedName >> namespaceOwner [ "Relation named: #namespaceOwner type: #FASTJavaQualifiedName opposite: #namespace" @@ -98,13 +90,6 @@ FASTJavaQualifiedName >> namespaceOwner: anObject [ namespaceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaQualifiedName >> namespaceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self namespaceOwner -] - { #category : 'accessing' } FASTJavaQualifiedName >> qualifiedNameOwner [ "Relation named: #qualifiedNameOwner type: #FASTJavaTWithQualifiedName opposite: #qualifiedName" @@ -122,10 +107,3 @@ FASTJavaQualifiedName >> qualifiedNameOwner: anObject [ qualifiedNameOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaQualifiedName >> qualifiedNameOwnerGroup [ - - - ^ MooseSpecializedGroup with: self qualifiedNameOwner -] diff --git a/src/FAST-Java-Model/FASTJavaQualifiedTypeName.class.st b/src/FAST-Java-Model/FASTJavaQualifiedTypeName.class.st index 3cabd52..644ad18 100644 --- a/src/FAST-Java-Model/FASTJavaQualifiedTypeName.class.st +++ b/src/FAST-Java-Model/FASTJavaQualifiedTypeName.class.st @@ -42,7 +42,6 @@ FASTJavaQualifiedTypeName class >> annotation [ - ^ self ] { #category : 'testing' } @@ -67,10 +66,3 @@ FASTJavaQualifiedTypeName >> namespace: anObject [ namespace := anObject ] - -{ #category : 'navigation' } -FASTJavaQualifiedTypeName >> namespaceGroup [ - - - ^ MooseSpecializedGroup with: self namespace -] diff --git a/src/FAST-Java-Model/FASTJavaReturnStatement.class.st b/src/FAST-Java-Model/FASTJavaReturnStatement.class.st index e070648..32692ac 100644 --- a/src/FAST-Java-Model/FASTJavaReturnStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaReturnStatement.class.st @@ -44,5 +44,4 @@ FASTJavaReturnStatement class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaShortTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaShortTypeExpression.class.st index e50b2ca..45db7e4 100644 --- a/src/FAST-Java-Model/FASTJavaShortTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaShortTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaShortTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaStatement.class.st b/src/FAST-Java-Model/FASTJavaStatement.class.st index 689d26d..a05a433 100644 --- a/src/FAST-Java-Model/FASTJavaStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaStatement.class.st @@ -39,5 +39,4 @@ FASTJavaStatement class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaStatementBlock.class.st b/src/FAST-Java-Model/FASTJavaStatementBlock.class.st index fffa004..153ba7c 100644 --- a/src/FAST-Java-Model/FASTJavaStatementBlock.class.st +++ b/src/FAST-Java-Model/FASTJavaStatementBlock.class.st @@ -5,7 +5,7 @@ ### Parents | Relation | Origin | Opposite | Type | Comment | |---| -| `fastBehaviouralParent` | `FASTTStatementBlock` | `statementBlock` | `FASTTBehaviouralEntity` | Behavioural entity containing the statement block.| +| `fastBehaviouralParent` | `FASTTStatementBlock` | `statementBlock` | `FASTTWithStatements` | Behavioural entity containing the statement block.| | `forIncrementorOwner` | `FASTTStatement` | `incrementor` | `FASTJavaForStatement` | I am the incrementor of the for| | `forIninitializerOwner` | `FASTTStatement` | `initializer` | `FASTJavaForStatement` | I am the initializer of the for| | `ifElsePartOwner` | `FASTTStatement` | `elsePart` | `FASTJavaIfStatement` | The if owner (if possible)| @@ -55,7 +55,6 @@ FASTJavaStatementBlock class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -76,13 +75,6 @@ FASTJavaStatementBlock >> javaCatchPartStatementOwner: anObject [ javaCatchPartStatementOwner := anObject ] -{ #category : 'navigation' } -FASTJavaStatementBlock >> javaCatchPartStatementOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaCatchPartStatementOwner -] - { #category : 'accessing' } FASTJavaStatementBlock >> javaTryCatchOwner [ "Relation named: #javaTryCatchOwner type: #FASTJavaTryCatchStatement opposite: #try" @@ -101,13 +93,6 @@ FASTJavaStatementBlock >> javaTryCatchOwner: anObject [ javaTryCatchOwner := anObject ] -{ #category : 'navigation' } -FASTJavaStatementBlock >> javaTryCatchOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTryCatchOwner -] - { #category : 'accessing' } FASTJavaStatementBlock >> javaTryFinallyOwner [ "Relation named: #javaTryFinallyOwner type: #FASTJavaTryCatchStatement opposite: #finally" @@ -125,10 +110,3 @@ FASTJavaStatementBlock >> javaTryFinallyOwner: anObject [ javaTryFinallyOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaStatementBlock >> javaTryFinallyOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTryFinallyOwner -] diff --git a/src/FAST-Java-Model/FASTJavaStringLiteral.class.st b/src/FAST-Java-Model/FASTJavaStringLiteral.class.st index 0e93289..cba8f72 100644 --- a/src/FAST-Java-Model/FASTJavaStringLiteral.class.st +++ b/src/FAST-Java-Model/FASTJavaStringLiteral.class.st @@ -30,7 +30,7 @@ I represent a string literal node. | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -64,5 +64,4 @@ FASTJavaStringLiteral class >> annotation [ - ^ self ] diff --git a/src/FAST-Java-Model/FASTJavaSwitchStatement.class.st b/src/FAST-Java-Model/FASTJavaSwitchStatement.class.st index f187ed5..5d11ff8 100644 --- a/src/FAST-Java-Model/FASTJavaSwitchStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaSwitchStatement.class.st @@ -55,7 +55,6 @@ FASTJavaSwitchStatement class >> annotation [ - ^ self ] { #category : 'adding' } @@ -81,13 +80,6 @@ FASTJavaSwitchStatement >> cases: anObject [ cases value: anObject ] -{ #category : 'navigation' } -FASTJavaSwitchStatement >> casesGroup [ - - - ^ MooseSpecializedGroup withAll: self cases asSet -] - { #category : 'accessing' } FASTJavaSwitchStatement >> condition [ "Relation named: #condition type: #FASTTExpression opposite: #switchConditionOwner" @@ -112,13 +104,6 @@ FASTJavaSwitchStatement >> condition: anObject [ anObject switchConditionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaSwitchStatement >> conditionGroup [ - - - ^ MooseSpecializedGroup with: self condition -] - { #category : 'testing' } FASTJavaSwitchStatement >> isSwitchStatement [ diff --git a/src/FAST-Java-Model/FASTJavaSynchronizedStatement.class.st b/src/FAST-Java-Model/FASTJavaSynchronizedStatement.class.st index 0212b0b..a844e04 100644 --- a/src/FAST-Java-Model/FASTJavaSynchronizedStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaSynchronizedStatement.class.st @@ -47,7 +47,6 @@ FASTJavaSynchronizedStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -74,13 +73,6 @@ FASTJavaSynchronizedStatement >> block: anObject [ anObject javaSynchronizedStatementOwner: self ] ] -{ #category : 'navigation' } -FASTJavaSynchronizedStatement >> blockGroup [ - - - ^ MooseSpecializedGroup with: self block -] - { #category : 'accessing' } FASTJavaSynchronizedStatement >> expression [ "Relation named: #expression type: #FASTTExpression opposite: #javaSynchronizedStatementOwner" @@ -105,13 +97,6 @@ FASTJavaSynchronizedStatement >> expression: anObject [ anObject javaSynchronizedStatementOwner: self ] ] -{ #category : 'navigation' } -FASTJavaSynchronizedStatement >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaSynchronizedStatement >> isSynchronizedStatement [ diff --git a/src/FAST-Java-Model/FASTJavaTAnnotationElement.trait.st b/src/FAST-Java-Model/FASTJavaTAnnotationElement.trait.st index 61155f8..a8b86e6 100644 --- a/src/FAST-Java-Model/FASTJavaTAnnotationElement.trait.st +++ b/src/FAST-Java-Model/FASTJavaTAnnotationElement.trait.st @@ -31,7 +31,6 @@ FASTJavaTAnnotationElement classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -51,13 +50,6 @@ FASTJavaTAnnotationElement >> arrayOwner: anObject [ arrayOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTAnnotationElement >> arrayOwnerGroup [ - - - ^ MooseSpecializedGroup with: self arrayOwner -] - { #category : 'accessing' } FASTJavaTAnnotationElement >> parentAnnotation [ "Relation named: #parentAnnotation type: #FASTJavaAnnotation opposite: #elements" @@ -75,10 +67,3 @@ FASTJavaTAnnotationElement >> parentAnnotation: anObject [ parentAnnotation := anObject ] - -{ #category : 'navigation' } -FASTJavaTAnnotationElement >> parentAnnotationGroup [ - - - ^ MooseSpecializedGroup with: self parentAnnotation -] diff --git a/src/FAST-Java-Model/FASTJavaTAssignable.trait.st b/src/FAST-Java-Model/FASTJavaTAssignable.trait.st index f168bfb..51f7785 100644 --- a/src/FAST-Java-Model/FASTJavaTAssignable.trait.st +++ b/src/FAST-Java-Model/FASTJavaTAssignable.trait.st @@ -31,7 +31,6 @@ FASTJavaTAssignable classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -51,10 +50,3 @@ FASTJavaTAssignable >> javaVariableAssignmentOwner: anObject [ javaVariableAssignmentOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTAssignable >> javaVariableAssignmentOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaVariableAssignmentOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTDeclaration.trait.st b/src/FAST-Java-Model/FASTJavaTDeclaration.trait.st index 3e13999..c9e3857 100644 --- a/src/FAST-Java-Model/FASTJavaTDeclaration.trait.st +++ b/src/FAST-Java-Model/FASTJavaTDeclaration.trait.st @@ -28,7 +28,6 @@ FASTJavaTDeclaration classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -47,10 +46,3 @@ FASTJavaTDeclaration >> javaDeclarationOwner: anObject [ javaDeclarationOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTDeclaration >> javaDeclarationOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaDeclarationOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTEntityCreator.trait.st b/src/FAST-Java-Model/FASTJavaTEntityCreator.trait.st index 83163be..8715bb5 100644 --- a/src/FAST-Java-Model/FASTJavaTEntityCreator.trait.st +++ b/src/FAST-Java-Model/FASTJavaTEntityCreator.trait.st @@ -17,7 +17,6 @@ FASTJavaTEntityCreator classSide >> annotation [ - ^ self ] { #category : 'entity creation' } diff --git a/src/FAST-Java-Model/FASTJavaTModifier.trait.st b/src/FAST-Java-Model/FASTJavaTModifier.trait.st index 498008f..f53854d 100644 --- a/src/FAST-Java-Model/FASTJavaTModifier.trait.st +++ b/src/FAST-Java-Model/FASTJavaTModifier.trait.st @@ -31,7 +31,6 @@ FASTJavaTModifier classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -50,10 +49,3 @@ FASTJavaTModifier >> javaModifierOwner: anObject [ javaModifierOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTModifier >> javaModifierOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaModifierOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTReceiver.trait.st b/src/FAST-Java-Model/FASTJavaTReceiver.trait.st index d99e30e..accaeed 100644 --- a/src/FAST-Java-Model/FASTJavaTReceiver.trait.st +++ b/src/FAST-Java-Model/FASTJavaTReceiver.trait.st @@ -28,7 +28,6 @@ FASTJavaTReceiver classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -48,10 +47,3 @@ FASTJavaTReceiver >> receiverOwner: anObject [ receiverOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTReceiver >> receiverOwnerGroup [ - - - ^ MooseSpecializedGroup with: self receiverOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTWithAssignable.trait.st b/src/FAST-Java-Model/FASTJavaTWithAssignable.trait.st index 84e0808..5116a93 100644 --- a/src/FAST-Java-Model/FASTJavaTWithAssignable.trait.st +++ b/src/FAST-Java-Model/FASTJavaTWithAssignable.trait.st @@ -28,7 +28,6 @@ FASTJavaTWithAssignable classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -46,10 +45,3 @@ FASTJavaTWithAssignable >> variable: anObject [ variable := anObject ] - -{ #category : 'navigation' } -FASTJavaTWithAssignable >> variableGroup [ - - - ^ MooseSpecializedGroup with: self variable -] diff --git a/src/FAST-Java-Model/FASTJavaTWithDeclarations.trait.st b/src/FAST-Java-Model/FASTJavaTWithDeclarations.trait.st index 9c63aba..0ae03dc 100644 --- a/src/FAST-Java-Model/FASTJavaTWithDeclarations.trait.st +++ b/src/FAST-Java-Model/FASTJavaTWithDeclarations.trait.st @@ -28,7 +28,6 @@ FASTJavaTWithDeclarations classSide >> annotation [ - ^ self ] { #category : 'adding' } @@ -53,10 +52,3 @@ FASTJavaTWithDeclarations >> declarations: anObject [ declarations value: anObject ] - -{ #category : 'navigation' } -FASTJavaTWithDeclarations >> declarationsGroup [ - - - ^ MooseSpecializedGroup withAll: self declarations asSet -] diff --git a/src/FAST-Java-Model/FASTJavaTWithModifiers.trait.st b/src/FAST-Java-Model/FASTJavaTWithModifiers.trait.st index 8c42080..1f4d649 100644 --- a/src/FAST-Java-Model/FASTJavaTWithModifiers.trait.st +++ b/src/FAST-Java-Model/FASTJavaTWithModifiers.trait.st @@ -28,7 +28,6 @@ FASTJavaTWithModifiers classSide >> annotation [ - ^ self ] { #category : 'adding' } @@ -53,10 +52,3 @@ FASTJavaTWithModifiers >> modifiers: anObject [ modifiers value: anObject ] - -{ #category : 'navigation' } -FASTJavaTWithModifiers >> modifiersGroup [ - - - ^ MooseSpecializedGroup withAll: self modifiers asSet -] diff --git a/src/FAST-Java-Model/FASTJavaTWithQualifiedName.trait.st b/src/FAST-Java-Model/FASTJavaTWithQualifiedName.trait.st index 2aceca2..ecc67e9 100644 --- a/src/FAST-Java-Model/FASTJavaTWithQualifiedName.trait.st +++ b/src/FAST-Java-Model/FASTJavaTWithQualifiedName.trait.st @@ -28,7 +28,6 @@ FASTJavaTWithQualifiedName classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -46,10 +45,3 @@ FASTJavaTWithQualifiedName >> qualifiedName: anObject [ qualifiedName := anObject ] - -{ #category : 'navigation' } -FASTJavaTWithQualifiedName >> qualifiedNameGroup [ - - - ^ MooseSpecializedGroup with: self qualifiedName -] diff --git a/src/FAST-Java-Model/FASTJavaTWithReceiver.trait.st b/src/FAST-Java-Model/FASTJavaTWithReceiver.trait.st index 302625c..a60cd49 100644 --- a/src/FAST-Java-Model/FASTJavaTWithReceiver.trait.st +++ b/src/FAST-Java-Model/FASTJavaTWithReceiver.trait.st @@ -28,7 +28,6 @@ FASTJavaTWithReceiver classSide >> annotation [ - ^ self ] { #category : 'accessing' } @@ -46,10 +45,3 @@ FASTJavaTWithReceiver >> receiver: anObject [ receiver := anObject ] - -{ #category : 'navigation' } -FASTJavaTWithReceiver >> receiverGroup [ - - - ^ MooseSpecializedGroup with: self receiver -] diff --git a/src/FAST-Java-Model/FASTJavaThis.class.st b/src/FAST-Java-Model/FASTJavaThis.class.st index fecca95..111ec8c 100644 --- a/src/FAST-Java-Model/FASTJavaThis.class.st +++ b/src/FAST-Java-Model/FASTJavaThis.class.st @@ -17,7 +17,6 @@ FASTJavaThis class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaThrowStatement.class.st b/src/FAST-Java-Model/FASTJavaThrowStatement.class.st index 037b15a..be6da16 100644 --- a/src/FAST-Java-Model/FASTJavaThrowStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaThrowStatement.class.st @@ -50,7 +50,6 @@ FASTJavaThrowStatement class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -77,13 +76,6 @@ FASTJavaThrowStatement >> expression: anObject [ anObject javaThrowStatementOwner: self ] ] -{ #category : 'navigation' } -FASTJavaThrowStatement >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaThrowStatement >> isThrowStatement [ diff --git a/src/FAST-Java-Model/FASTJavaTryCatchStatement.class.st b/src/FAST-Java-Model/FASTJavaTryCatchStatement.class.st index a7e9464..e588118 100644 --- a/src/FAST-Java-Model/FASTJavaTryCatchStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaTryCatchStatement.class.st @@ -68,7 +68,6 @@ FASTJavaTryCatchStatement class >> annotation [ - ^ self ] { #category : 'adding' } @@ -100,13 +99,6 @@ FASTJavaTryCatchStatement >> catches: anObject [ catches value: anObject ] -{ #category : 'navigation' } -FASTJavaTryCatchStatement >> catchesGroup [ - - - ^ MooseSpecializedGroup withAll: self catches asSet -] - { #category : 'accessing' } FASTJavaTryCatchStatement >> finally [ "Relation named: #finally type: #FASTJavaStatementBlock opposite: #javaTryFinallyOwner" @@ -123,13 +115,6 @@ FASTJavaTryCatchStatement >> finally: anObject [ finally := anObject ] -{ #category : 'navigation' } -FASTJavaTryCatchStatement >> finallyGroup [ - - - ^ MooseSpecializedGroup with: self finally -] - { #category : 'testing' } FASTJavaTryCatchStatement >> isTryCatchStatement [ @@ -154,13 +139,6 @@ FASTJavaTryCatchStatement >> resources: anObject [ resources value: anObject ] -{ #category : 'navigation' } -FASTJavaTryCatchStatement >> resourcesGroup [ - - - ^ MooseSpecializedGroup withAll: self resources asSet -] - { #category : 'accessing' } FASTJavaTryCatchStatement >> try [ "Relation named: #try type: #FASTJavaStatementBlock opposite: #javaTryCatchOwner" @@ -176,10 +154,3 @@ FASTJavaTryCatchStatement >> try: anObject [ try := anObject ] - -{ #category : 'navigation' } -FASTJavaTryCatchStatement >> tryGroup [ - - - ^ MooseSpecializedGroup with: self try -] diff --git a/src/FAST-Java-Model/FASTJavaTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaTypeExpression.class.st index 9b288f6..475913f 100644 --- a/src/FAST-Java-Model/FASTJavaTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaTypeExpression.class.st @@ -41,7 +41,6 @@ FASTJavaTypeExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -61,13 +60,6 @@ FASTJavaTypeExpression >> catchOwner: anObject [ catchOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> catchOwnerGroup [ - - - ^ MooseSpecializedGroup with: self catchOwner -] - { #category : 'testing' } FASTJavaTypeExpression >> isTypeExpression [ @@ -92,13 +84,6 @@ FASTJavaTypeExpression >> javaClassDeclarationInterfaceOwner: anObject [ javaClassDeclarationInterfaceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaClassDeclarationInterfaceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaClassDeclarationInterfaceOwner -] - { #category : 'accessing' } FASTJavaTypeExpression >> javaClassDeclarationSuperclassOwner [ "Relation named: #javaClassDeclarationSuperclassOwner type: #FASTJavaClassDeclaration opposite: #superclass" @@ -117,13 +102,6 @@ FASTJavaTypeExpression >> javaClassDeclarationSuperclassOwner: anObject [ javaClassDeclarationSuperclassOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaClassDeclarationSuperclassOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaClassDeclarationSuperclassOwner -] - { #category : 'accessing' } FASTJavaTypeExpression >> javaEnumDeclarationInterfaceOwner [ "Relation named: #javaEnumDeclarationInterfaceOwner type: #FASTJavaEnumDeclaration opposite: #interfaces" @@ -141,13 +119,6 @@ FASTJavaTypeExpression >> javaEnumDeclarationInterfaceOwner: anObject [ javaEnumDeclarationInterfaceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaEnumDeclarationInterfaceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaEnumDeclarationInterfaceOwner -] - { #category : 'accessing' } FASTJavaTypeExpression >> javaForEachStatementTypeOwner [ "Relation named: #javaForEachStatementTypeOwner type: #FASTJavaForEachStatement opposite: #type" @@ -166,13 +137,6 @@ FASTJavaTypeExpression >> javaForEachStatementTypeOwner: anObject [ javaForEachStatementTypeOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaForEachStatementTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaForEachStatementTypeOwner -] - { #category : 'accessing' } FASTJavaTypeExpression >> javaInterfaceDeclarationInterfaceOwner [ "Relation named: #javaInterfaceDeclarationInterfaceOwner type: #FASTJavaInterfaceDeclaration opposite: #interfaces" @@ -190,13 +154,6 @@ FASTJavaTypeExpression >> javaInterfaceDeclarationInterfaceOwner: anObject [ javaInterfaceDeclarationInterfaceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaInterfaceDeclarationInterfaceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaInterfaceDeclarationInterfaceOwner -] - { #category : 'accessing' } FASTJavaTypeExpression >> javaTypePatternTypeOwner [ "Relation named: #javaTypePatternTypeOwner type: #FASTJavaTypePattern opposite: #type" @@ -214,10 +171,3 @@ FASTJavaTypeExpression >> javaTypePatternTypeOwner: anObject [ javaTypePatternTypeOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTypeExpression >> javaTypePatternTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTypePatternTypeOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTypeName.class.st b/src/FAST-Java-Model/FASTJavaTypeName.class.st index 21143f1..d8b1b51 100644 --- a/src/FAST-Java-Model/FASTJavaTypeName.class.st +++ b/src/FAST-Java-Model/FASTJavaTypeName.class.st @@ -35,7 +35,7 @@ I represent the name of a type | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -73,7 +73,6 @@ FASTJavaTypeName class >> annotation [ - ^ self ] { #category : 'testing' } @@ -101,13 +100,6 @@ FASTJavaTypeName >> javaTypeNameQualify: anObject [ javaTypeNameQualify := anObject ] -{ #category : 'navigation' } -FASTJavaTypeName >> javaTypeNameQualifyGroup [ - - - ^ MooseSpecializedGroup with: self javaTypeNameQualify -] - { #category : 'accessing' } FASTJavaTypeName >> javaTypeNameTypeExpressionOwner [ "Relation named: #javaTypeNameTypeExpressionOwner type: #FASTJavaClassTypeExpression opposite: #typeName" @@ -125,10 +117,3 @@ FASTJavaTypeName >> javaTypeNameTypeExpressionOwner: anObject [ javaTypeNameTypeExpressionOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaTypeName >> javaTypeNameTypeExpressionOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTypeNameTypeExpressionOwner -] diff --git a/src/FAST-Java-Model/FASTJavaTypeParameterExpression.class.st b/src/FAST-Java-Model/FASTJavaTypeParameterExpression.class.st index 52978de..415c093 100644 --- a/src/FAST-Java-Model/FASTJavaTypeParameterExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaTypeParameterExpression.class.st @@ -32,7 +32,7 @@ I represent JavaTypeParameter such as `void T myMethod()` | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -75,7 +75,6 @@ FASTJavaTypeParameterExpression class >> annotation [ - ^ self ] { #category : 'adding' } @@ -108,13 +107,6 @@ FASTJavaTypeParameterExpression >> javaMethodTypeParameterOwner: anObject [ javaMethodTypeParameterOwner := anObject ] -{ #category : 'navigation' } -FASTJavaTypeParameterExpression >> javaMethodTypeParameterOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaMethodTypeParameterOwner -] - { #category : 'accessing' } FASTJavaTypeParameterExpression >> types [ "Relation named: #types type: #FASTJavaClassTypeExpression opposite: #typeParameterOwner" @@ -131,10 +123,3 @@ FASTJavaTypeParameterExpression >> types: anObject [ types value: anObject ] - -{ #category : 'navigation' } -FASTJavaTypeParameterExpression >> typesGroup [ - - - ^ MooseSpecializedGroup withAll: self types asSet -] diff --git a/src/FAST-Java-Model/FASTJavaTypePattern.class.st b/src/FAST-Java-Model/FASTJavaTypePattern.class.st index 7adee5c..d3db31c 100644 --- a/src/FAST-Java-Model/FASTJavaTypePattern.class.st +++ b/src/FAST-Java-Model/FASTJavaTypePattern.class.st @@ -39,7 +39,7 @@ Example: | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -82,7 +82,6 @@ FASTJavaTypePattern class >> annotation [ - ^ self ] { #category : 'testing' } @@ -108,13 +107,6 @@ FASTJavaTypePattern >> type: anObject [ type := anObject ] -{ #category : 'navigation' } -FASTJavaTypePattern >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] - { #category : 'accessing' } FASTJavaTypePattern >> variable [ "Relation named: #variable type: #FASTJavaVariableExpression opposite: #javaTypePatternVariableOwner" @@ -130,10 +122,3 @@ FASTJavaTypePattern >> variable: anObject [ variable := anObject ] - -{ #category : 'navigation' } -FASTJavaTypePattern >> variableGroup [ - - - ^ MooseSpecializedGroup with: self variable -] diff --git a/src/FAST-Java-Model/FASTJavaUnaryExpression.class.st b/src/FAST-Java-Model/FASTJavaUnaryExpression.class.st index 0c30c3b..cf4f3a4 100644 --- a/src/FAST-Java-Model/FASTJavaUnaryExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaUnaryExpression.class.st @@ -42,7 +42,7 @@ see: https://docs.oracle.com/javase/tutorial/java/nutsandbolts/op1.html | `javaThrowStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaThrowStatement` | The javaThrowStatement owner (if possible)| | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -86,7 +86,6 @@ FASTJavaUnaryExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -113,13 +112,6 @@ FASTJavaUnaryExpression >> expression: anObject [ anObject javaUnaryExpressionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaUnaryExpression >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'accessing' } FASTJavaUnaryExpression >> isPrefixedUnaryExpression [ diff --git a/src/FAST-Java-Model/FASTJavaVarDeclStatement.class.st b/src/FAST-Java-Model/FASTJavaVarDeclStatement.class.st index b53ea0a..9bdf377 100644 --- a/src/FAST-Java-Model/FASTJavaVarDeclStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaVarDeclStatement.class.st @@ -61,7 +61,6 @@ FASTJavaVarDeclStatement class >> annotation [ - ^ self ] { #category : 'adding' } @@ -87,13 +86,6 @@ FASTJavaVarDeclStatement >> declarators: anObject [ declarators value: anObject ] -{ #category : 'navigation' } -FASTJavaVarDeclStatement >> declaratorsGroup [ - - - ^ MooseSpecializedGroup withAll: self declarators asSet -] - { #category : 'testing' } FASTJavaVarDeclStatement >> isVarDeclStatement [ @@ -118,13 +110,6 @@ FASTJavaVarDeclStatement >> javaTryResourceOwner: anObject [ javaTryResourceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVarDeclStatement >> javaTryResourceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTryResourceOwner -] - { #category : 'accessing' } FASTJavaVarDeclStatement >> type [ "Relation named: #type type: #FASTJavaVariableExpression opposite: #javaVarDeclTypeOwner" @@ -140,10 +125,3 @@ FASTJavaVarDeclStatement >> type: anObject [ type := anObject ] - -{ #category : 'navigation' } -FASTJavaVarDeclStatement >> typeGroup [ - - - ^ MooseSpecializedGroup with: self type -] diff --git a/src/FAST-Java-Model/FASTJavaVarTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaVarTypeExpression.class.st index 4142b2f..7fae606 100644 --- a/src/FAST-Java-Model/FASTJavaVarTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaVarTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaVarTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaVariableDeclarator.class.st b/src/FAST-Java-Model/FASTJavaVariableDeclarator.class.st index a58e020..6b74353 100644 --- a/src/FAST-Java-Model/FASTJavaVariableDeclarator.class.st +++ b/src/FAST-Java-Model/FASTJavaVariableDeclarator.class.st @@ -51,7 +51,6 @@ FASTJavaVariableDeclarator class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -78,13 +77,6 @@ FASTJavaVariableDeclarator >> expression: anObject [ anObject javaVariableDeclaratorExpressionOwner: self ] ] -{ #category : 'navigation' } -FASTJavaVariableDeclarator >> expressionGroup [ - - - ^ MooseSpecializedGroup with: self expression -] - { #category : 'testing' } FASTJavaVariableDeclarator >> isVariableDeclarator [ @@ -109,13 +101,6 @@ FASTJavaVariableDeclarator >> varDeclOwner: anObject [ varDeclOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableDeclarator >> varDeclOwnerGroup [ - - - ^ MooseSpecializedGroup with: self varDeclOwner -] - { #category : 'accessing' } FASTJavaVariableDeclarator >> variable [ "Relation named: #variable type: #FASTJavaVariableExpression opposite: #javaVariableDeclaratorOwner" @@ -131,10 +116,3 @@ FASTJavaVariableDeclarator >> variable: anObject [ variable := anObject ] - -{ #category : 'navigation' } -FASTJavaVariableDeclarator >> variableGroup [ - - - ^ MooseSpecializedGroup with: self variable -] diff --git a/src/FAST-Java-Model/FASTJavaVariableExpression.class.st b/src/FAST-Java-Model/FASTJavaVariableExpression.class.st index 39fc191..cc7d690 100644 --- a/src/FAST-Java-Model/FASTJavaVariableExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaVariableExpression.class.st @@ -42,7 +42,7 @@ | `javaVariableAssignmentOwner` | `FASTJavaTAssignable` | `variable` | `FASTJavaTWithAssignable` | The owner of the assignment| | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| | `javaVariableDeclaratorOwner` | `FASTJavaVariableExpression` | `variable` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)| -| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used| +| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used| | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression| | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side| | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side| @@ -91,7 +91,6 @@ FASTJavaVariableExpression class >> annotation [ - ^ self ] { #category : 'accessing' } @@ -112,13 +111,6 @@ FASTJavaVariableExpression >> javaCastExpressionTypeOwner: anObject [ javaCastExpressionTypeOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaCastExpressionTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaCastExpressionTypeOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaCatchParameterOwnler [ "Relation named: #javaCatchParameterOwnler type: #FASTJavaCatchPartStatement opposite: #parameter" @@ -137,13 +129,6 @@ FASTJavaVariableExpression >> javaCatchParameterOwnler: anObject [ javaCatchParameterOwnler := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaCatchParameterOwnlerGroup [ - - - ^ MooseSpecializedGroup with: self javaCatchParameterOwnler -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaClassPropertyOwner [ "Relation named: #javaClassPropertyOwner type: #FASTJavaClassProperty opposite: #type" @@ -162,13 +147,6 @@ FASTJavaVariableExpression >> javaClassPropertyOwner: anObject [ javaClassPropertyOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaClassPropertyOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaClassPropertyOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaMethodReferenceOwner [ "Relation named: #javaMethodReferenceOwner type: #FASTJavaMethodReference opposite: #receiver" @@ -187,13 +165,6 @@ FASTJavaVariableExpression >> javaMethodReferenceOwner: anObject [ javaMethodReferenceOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaMethodReferenceOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaMethodReferenceOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaMethodTypeOwner [ "Relation named: #javaMethodTypeOwner type: #FASTJavaMethodEntity opposite: #type" @@ -212,13 +183,6 @@ FASTJavaVariableExpression >> javaMethodTypeOwner: anObject [ javaMethodTypeOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaMethodTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaMethodTypeOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaNewExpressionOwner [ "Relation named: #javaNewExpressionOwner type: #FASTJavaNewExpression opposite: #type" @@ -237,13 +201,6 @@ FASTJavaVariableExpression >> javaNewExpressionOwner: anObject [ javaNewExpressionOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaNewExpressionOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaNewExpressionOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaOuterThisOwner [ "Relation named: #javaOuterThisOwner type: #FASTJavaOuterThis opposite: #type" @@ -262,13 +219,6 @@ FASTJavaVariableExpression >> javaOuterThisOwner: anObject [ javaOuterThisOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaOuterThisOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaOuterThisOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaParameterTypeOwner [ "Relation named: #javaParameterTypeOwner type: #FASTJavaParameter opposite: #type" @@ -287,13 +237,6 @@ FASTJavaVariableExpression >> javaParameterTypeOwner: anObject [ javaParameterTypeOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaParameterTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaParameterTypeOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaParameterVariableOwner [ "Relation named: #javaParameterVariableOwner type: #FASTJavaParameter opposite: #variable" @@ -312,13 +255,6 @@ FASTJavaVariableExpression >> javaParameterVariableOwner: anObject [ javaParameterVariableOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaParameterVariableOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaParameterVariableOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaTypePatternVariableOwner [ "Relation named: #javaTypePatternVariableOwner type: #FASTJavaTypePattern opposite: #variable" @@ -337,13 +273,6 @@ FASTJavaVariableExpression >> javaTypePatternVariableOwner: anObject [ javaTypePatternVariableOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaTypePatternVariableOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaTypePatternVariableOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaVarDeclTypeOwner [ "Relation named: #javaVarDeclTypeOwner type: #FASTJavaVarDeclStatement opposite: #type" @@ -362,13 +291,6 @@ FASTJavaVariableExpression >> javaVarDeclTypeOwner: anObject [ javaVarDeclTypeOwner := anObject ] -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaVarDeclTypeOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaVarDeclTypeOwner -] - { #category : 'accessing' } FASTJavaVariableExpression >> javaVariableDeclaratorOwner [ "Relation named: #javaVariableDeclaratorOwner type: #FASTJavaVariableDeclarator opposite: #variable" @@ -386,10 +308,3 @@ FASTJavaVariableExpression >> javaVariableDeclaratorOwner: anObject [ javaVariableDeclaratorOwner := anObject ] - -{ #category : 'navigation' } -FASTJavaVariableExpression >> javaVariableDeclaratorOwnerGroup [ - - - ^ MooseSpecializedGroup with: self javaVariableDeclaratorOwner -] diff --git a/src/FAST-Java-Model/FASTJavaVoidTypeExpression.class.st b/src/FAST-Java-Model/FASTJavaVoidTypeExpression.class.st index b769b3e..9cf55f5 100644 --- a/src/FAST-Java-Model/FASTJavaVoidTypeExpression.class.st +++ b/src/FAST-Java-Model/FASTJavaVoidTypeExpression.class.st @@ -17,7 +17,6 @@ FASTJavaVoidTypeExpression class >> annotation [ - ^ self ] { #category : 'testing' } diff --git a/src/FAST-Java-Model/FASTJavaWhileStatement.class.st b/src/FAST-Java-Model/FASTJavaWhileStatement.class.st index 16742c4..982416c 100644 --- a/src/FAST-Java-Model/FASTJavaWhileStatement.class.st +++ b/src/FAST-Java-Model/FASTJavaWhileStatement.class.st @@ -24,7 +24,7 @@ while(...) { | Relation | Origin | Opposite | Type | Comment | |---| | `body` | `FASTTLoopStatement` | `parentLoopStatement` | `FASTTStatement` | The body of the loop| -| `condition` | `FASTTConditionalStatement` | `parentConditionalStatement` | `FASTTExpression` | The boolean condition tested| +| `condition` | `FASTTWithCondition` | `parentConditional` | `FASTTExpression` | The boolean condition tested| ## Properties @@ -52,7 +52,6 @@ FASTJavaWhileStatement class >> annotation [ - ^ self ] { #category : 'testing' }