Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: import of CtRole #2132

Merged
merged 1 commit into from
Jun 28, 2018
Merged

refactor: import of CtRole #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/spoon/reflect/declaration/CtPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import spoon.support.DerivedProperty;
import spoon.reflect.annotations.PropertyGetter;
import spoon.reflect.annotations.PropertySetter;
import spoon.reflect.path.CtRole;

import java.util.Set;

Expand Down Expand Up @@ -95,13 +94,13 @@ public interface CtPackage extends CtNamedElement, CtShadowable {
*
* @return the found type or null
*/
@PropertyGetter(role = CtRole.CONTAINED_TYPE)
@PropertyGetter(role = CONTAINED_TYPE)
<T extends CtType<?>> T getType(String simpleName);

/**
* Returns the set of the top-level types in this package.
*/
@PropertyGetter(role = CtRole.CONTAINED_TYPE)
@PropertyGetter(role = CONTAINED_TYPE)
Set<CtType<?>> getTypes();

/**
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtArrayAccessImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtArrayAccess;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;

import static spoon.reflect.path.CtRole.EXPRESSION;

public abstract class CtArrayAccessImpl<T, V extends CtExpression<?>> extends CtTargetedExpressionImpl<T, V> implements CtArrayAccess<T, V> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.EXPRESSION)
@MetamodelPropertyField(role = EXPRESSION)
private CtExpression<Integer> expression;

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/spoon/support/reflect/code/CtAssertImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtAssert;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.CONDITION;
Expand All @@ -28,10 +27,10 @@
public class CtAssertImpl<T> extends CtStatementImpl implements CtAssert<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.CONDITION)
@MetamodelPropertyField(role = CONDITION)
CtExpression<Boolean> asserted;

@MetamodelPropertyField(role = CtRole.EXPRESSION)
@MetamodelPropertyField(role = EXPRESSION)
CtExpression<T> value;

@Override
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/spoon/support/reflect/code/CtAssignmentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtRHSReceiver;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtTypeReference;
import spoon.reflect.visitor.CtVisitor;
import spoon.support.reflect.declaration.CtElementImpl;
Expand All @@ -38,16 +37,16 @@
public class CtAssignmentImpl<T, A extends T> extends CtStatementImpl implements CtAssignment<T, A> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.ASSIGNED)
@MetamodelPropertyField(role = ASSIGNED)
CtExpression<T> assigned;

@MetamodelPropertyField(role = CtRole.ASSIGNMENT)
@MetamodelPropertyField(role = ASSIGNMENT)
CtExpression<A> assignment;

@MetamodelPropertyField(role = CtRole.TYPE)
@MetamodelPropertyField(role = TYPE)
CtTypeReference<T> type;

@MetamodelPropertyField(role = CtRole.CAST)
@MetamodelPropertyField(role = CAST)
List<CtTypeReference<?>> typeCasts = emptyList();

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtBinaryOperatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import spoon.reflect.code.BinaryOperatorKind;
import spoon.reflect.code.CtBinaryOperator;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.LEFT_OPERAND;
Expand All @@ -30,13 +29,13 @@
public class CtBinaryOperatorImpl<T> extends CtExpressionImpl<T> implements CtBinaryOperator<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.OPERATOR_KIND)
@MetamodelPropertyField(role = OPERATOR_KIND)
BinaryOperatorKind kind;

@MetamodelPropertyField(role = CtRole.LEFT_OPERAND)
@MetamodelPropertyField(role = LEFT_OPERAND)
CtExpression<?> leftHandOperand;

@MetamodelPropertyField(role = CtRole.RIGHT_OPERAND)
@MetamodelPropertyField(role = RIGHT_OPERAND)
CtExpression<?> rightHandOperand;

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtBreakImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import spoon.reflect.code.CtLabelledFlowBreak;
import spoon.reflect.code.CtStatement;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;
import spoon.reflect.visitor.filter.ParentFunction;

Expand All @@ -32,7 +31,7 @@
public class CtBreakImpl extends CtStatementImpl implements CtBreak {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.TARGET_LABEL)
@MetamodelPropertyField(role = TARGET_LABEL)
String targetLabel;

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/spoon/support/reflect/code/CtCatchImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtCatch;
import spoon.reflect.code.CtCatchVariable;
import spoon.reflect.code.CtStatement;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.BODY;
Expand All @@ -31,10 +30,10 @@
public class CtCatchImpl extends CtCodeElementImpl implements CtCatch {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.BODY)
@MetamodelPropertyField(role = BODY)
CtBlock<?> body;

@MetamodelPropertyField(role = CtRole.PARAMETER)
@MetamodelPropertyField(role = PARAMETER)
CtCatchVariable<? extends Throwable> parameter;

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtConditionalImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtConditional;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.CONDITION;
Expand All @@ -29,13 +28,13 @@
public class CtConditionalImpl<T> extends CtExpressionImpl<T> implements CtConditional<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.ELSE)
@MetamodelPropertyField(role = ELSE)
CtExpression<T> elseExpression;

@MetamodelPropertyField(role = CtRole.CONDITION)
@MetamodelPropertyField(role = CONDITION)
CtExpression<Boolean> condition;

@MetamodelPropertyField(role = CtRole.THEN)
@MetamodelPropertyField(role = THEN)
CtExpression<T> thenExpression;

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtStatementList;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtActualTypeContainer;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtTypeReference;
Expand All @@ -42,11 +41,11 @@
public class CtConstructorCallImpl<T> extends CtTargetedExpressionImpl<T, CtExpression<?>> implements CtConstructorCall<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.ARGUMENT)
@MetamodelPropertyField(role = ARGUMENT)
List<CtExpression<?>> arguments = emptyList();
@MetamodelPropertyField(role = CtRole.EXECUTABLE_REF)
@MetamodelPropertyField(role = EXECUTABLE_REF)
CtExecutableReference<T> executable;
@MetamodelPropertyField(role = CtRole.LABEL)
@MetamodelPropertyField(role = LABEL)
String label;

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtContinueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import spoon.reflect.code.CtLabelledFlowBreak;
import spoon.reflect.code.CtStatement;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;
import spoon.reflect.visitor.filter.ParentFunction;

Expand All @@ -32,7 +31,7 @@
public class CtContinueImpl extends CtStatementImpl implements CtContinue {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.TARGET_LABEL)
@MetamodelPropertyField(role = TARGET_LABEL)
String targetLabel;

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtDoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtDo;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.EXPRESSION;

public class CtDoImpl extends CtLoopImpl implements CtDo {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.EXPRESSION)
@MetamodelPropertyField(role = EXPRESSION)
CtExpression<Boolean> expression;

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtExecutableReferenceExpressionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtExecutableReferenceExpression;
import spoon.reflect.code.CtExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.EXECUTABLE_REF;

public class CtExecutableReferenceExpressionImpl<T, E extends CtExpression<?>> extends CtTargetedExpressionImpl<T, E> implements CtExecutableReferenceExpression<T, E> {
@MetamodelPropertyField(role = CtRole.EXECUTABLE_REF)
@MetamodelPropertyField(role = EXECUTABLE_REF)
CtExecutableReference<T> executable;

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/spoon/support/reflect/code/CtExpressionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.code.CtExpression;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtTypeReference;
import spoon.support.reflect.declaration.CtElementImpl;

Expand All @@ -33,10 +32,10 @@
public abstract class CtExpressionImpl<T> extends CtCodeElementImpl implements CtExpression<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.TYPE)
@MetamodelPropertyField(role = TYPE)
CtTypeReference<T> type;

@MetamodelPropertyField(role = CtRole.CAST)
@MetamodelPropertyField(role = CAST)
List<CtTypeReference<?>> typeCasts = emptyList();

public CtTypeReference<T> getType() {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtFieldAccessImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtFieldAccess;
import spoon.reflect.code.CtTargetedExpression;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtFieldReference;

import static spoon.reflect.path.CtRole.TARGET;

public abstract class CtFieldAccessImpl<T> extends CtVariableAccessImpl<T> implements CtFieldAccess<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.TARGET)
@MetamodelPropertyField(role = TARGET)
CtExpression<?> target;

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/spoon/support/reflect/code/CtForEachImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtForEach;
import spoon.reflect.code.CtLocalVariable;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.EXPRESSION;
Expand All @@ -29,7 +28,7 @@
public class CtForEachImpl extends CtLoopImpl implements CtForEach {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.EXPRESSION)
@MetamodelPropertyField(role = EXPRESSION)
CtExpression<?> expression;

@MetamodelPropertyField(role = FOREACH_VARIABLE)
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtForImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtFor;
import spoon.reflect.code.CtStatement;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;
import spoon.support.reflect.declaration.CtElementImpl;

Expand All @@ -36,13 +35,13 @@
public class CtForImpl extends CtLoopImpl implements CtFor {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.EXPRESSION)
@MetamodelPropertyField(role = EXPRESSION)
CtExpression<Boolean> expression;

@MetamodelPropertyField(role = CtRole.FOR_INIT)
@MetamodelPropertyField(role = FOR_INIT)
List<CtStatement> forInit = emptyList();

@MetamodelPropertyField(role = CtRole.FOR_UPDATE)
@MetamodelPropertyField(role = FOR_UPDATE)
List<CtStatement> forUpdate = emptyList();

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtIfImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtIf;
import spoon.reflect.code.CtStatement;
import spoon.reflect.declaration.CtType;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

import static spoon.reflect.path.CtRole.CONDITION;
Expand All @@ -32,13 +31,13 @@
public class CtIfImpl extends CtStatementImpl implements CtIf {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.CONDITION)
@MetamodelPropertyField(role = CONDITION)
CtExpression<Boolean> condition;

@MetamodelPropertyField(role = CtRole.ELSE)
@MetamodelPropertyField(role = ELSE)
CtStatement elseStatement;

@MetamodelPropertyField(role = CtRole.THEN)
@MetamodelPropertyField(role = THEN)
CtStatement thenStatement;

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/spoon/support/reflect/code/CtInvocationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtStatementList;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtActualTypeContainer;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtTypeReference;
Expand All @@ -42,13 +41,13 @@
public class CtInvocationImpl<T> extends CtTargetedExpressionImpl<T, CtExpression<?>> implements CtInvocation<T> {
private static final long serialVersionUID = 1L;

@MetamodelPropertyField(role = CtRole.LABEL)
@MetamodelPropertyField(role = LABEL)
String label;

@MetamodelPropertyField(role = CtRole.ARGUMENT)
@MetamodelPropertyField(role = ARGUMENT)
List<CtExpression<?>> arguments = emptyList();

@MetamodelPropertyField(role = CtRole.EXECUTABLE_REF)
@MetamodelPropertyField(role = EXECUTABLE_REF)
CtExecutableReference<T> executable;

@Override
Expand Down
Loading