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.

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

review refactor: Remove replace methods which were using CtElement#replace #1704

Merged
merged 2 commits into from
Nov 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 5 deletions src/main/java/spoon/reflect/code/CtBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
*/
public interface CtBlock<R> extends CtStatement, CtStatementList, TemplateParameter<R> {

/**
* Replaces this element by another one.
*/
<T extends R> void replace(CtBlock<T> element);

@Override
CtBlock<R> clone();
}
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/code/CtExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ public interface CtExpression<T> extends CtCodeElement, CtTypedElement<T>, Templ
@PropertySetter(role = CAST)
<C extends CtExpression<T>> C addTypeCast(CtTypeReference<?> type);

/**
* Replaces this element by another one.
*/
<E extends T> void replace(CtExpression<E> element);

@Override
CtExpression<T> clone();
}
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/code/CtStatement.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ public interface CtStatement extends CtCodeElement {
@PropertySetter(role = LABEL)
<T extends CtStatement> T setLabel(String label);

/**
* Replaces this element by another one.
*/
void replace(CtStatement element);

@Override
CtStatement clone();
}
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/declaration/CtField.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ public interface CtField<T> extends CtVariable<T>, CtTypeMember, CtRHSReceiver<T
@DerivedProperty
CtExpression<T> getAssignment();

/**
* Replaces this element by another one.
*/
<R extends T> void replace(CtField<R> element);

@Override
CtField<T> clone();
}
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/declaration/CtMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ public interface CtMethod<T> extends CtExecutable<T>, CtTypeMember, CtFormalType
@PropertySetter(role = IS_DEFAULT)
<C extends CtMethod<T>> C setDefaultMethod(boolean defaultMethod);

/**
* Replaces this element by another one.
*/
<R extends T> void replace(CtMethod<T> element);

@Override
CtMethod<T> clone();
}
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,6 @@ public interface CtExecutableReference<T> extends CtReference, CtActualTypeConta
*/
String getSignature();

/**
* Replaces an executable reference by another one.
*/
void replace(CtExecutableReference<?> reference);

@Override
CtExecutableReference<T> clone();
}
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/reference/CtPackageReference.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ public interface CtPackageReference extends CtReference {
*/
Package getActualPackage();

/**
* Replace a package reference by another one.
*/
void replace(CtPackageReference packageReference);

/**
* Returns {@code true} if this is a reference to an <i>unnamed</i>
* Java package. See JLS §7.4.2. Unnamed Packages.
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/spoon/reflect/reference/CtTypeReference.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@ public interface CtTypeReference<T> extends CtReference, CtActualTypeContainer,
@PropertySetter(role = PACKAGE_REF)
<C extends CtTypeReference<T>> C setPackage(CtPackageReference pack);

/**
* Replaces a type reference by another one.
*/
void replace(CtTypeReference<?> reference);

/**
* Casts the type reference in {@link CtIntersectionTypeReference}.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ public interface CtVariableReference<T> extends CtReference {
*/
Set<ModifierKind> getModifiers();

/**
* Replace a variable reference by another one.
*/
void replace(CtVariableReference<?> reference);

@Override
CtVariableReference<T> clone();
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import spoon.reflect.code.CtAssignment;
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtRHSReceiver;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtTypeReference;
Expand Down Expand Up @@ -137,11 +136,6 @@ public <C extends CtExpression<T>> C addTypeCast(CtTypeReference<?> type) {
return (C) this;
}

@Override
public <E extends T> void replace(CtExpression<E> element) {
replace((CtElement) element);
}

@Override
public T S() {
return null;
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/spoon/support/reflect/code/CtBlockImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtStatementList;
import spoon.reflect.declaration.CtConstructor;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.ParentNotInitializedException;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;
Expand Down Expand Up @@ -239,11 +238,6 @@ public Iterator<CtStatement> iterator() {
return Collections.unmodifiableList(new ArrayList<>(getStatements())).iterator();
}

@Override
public <T extends R> void replace(CtBlock<T> element) {
replace((CtElement) element);
}

@Override
public R S() {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtStatementList;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtActualTypeContainer;
Expand Down Expand Up @@ -158,11 +157,6 @@ public <C extends CtStatement> C setLabel(String label) {
return (C) this;
}

@Override
public void replace(CtStatement element) {
replace((CtElement) element);
}

@Override
@DerivedProperty
public List<CtTypeReference<?>> getActualTypeArguments() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ public <C extends CtExpression<T>> C addTypeCast(CtTypeReference<?> type) {
return (C) this;
}

@Override
public <E extends T> void replace(CtExpression<E> element) {
super.replace(element);
}

@Override
public T S() {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtInvocation;
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtStatementList;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtTypedElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.reference.CtActualTypeContainer;
Expand Down Expand Up @@ -161,11 +160,6 @@ public <C extends CtStatement> C setLabel(String label) {
return (C) this;
}

@Override
public void replace(CtStatement element) {
replace((CtElement) element);
}

@Override
@DerivedProperty
public CtTypeReference<T> getType() {
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/spoon/support/reflect/code/CtStatementImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,6 @@ public <T extends CtStatement> T setLabel(String label) {
return (T) this;
}

@Override
public void replace(CtStatement element) {
replace((CtElement) element);
}

@Override
public CtStatement clone() {
return (CtStatement) super.clone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import spoon.reflect.code.CtStatementList;
import spoon.reflect.code.CtUnaryOperator;
import spoon.reflect.code.UnaryOperatorKind;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.path.CtRole;
import spoon.reflect.visitor.CtVisitor;

Expand Down Expand Up @@ -110,11 +109,6 @@ public <C extends CtStatement> C setLabel(String label) {
return (C) this;
}

@Override
public void replace(CtStatement element) {
replace((CtElement) element);
}

@Override
public CtUnaryOperator<T> clone() {
return (CtUnaryOperator<T>) super.clone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import spoon.reflect.declaration.CtAnonymousExecutable;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtConstructor;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtExecutable;
import spoon.reflect.declaration.CtType;
import spoon.reflect.declaration.CtTypeMember;
Expand Down Expand Up @@ -255,11 +254,6 @@ public Collection<CtExecutableReference<?>> getDeclaredExecutables() {
return Collections.unmodifiableList(l);
}

@Override
public void replace(CtStatement element) {
replace((CtElement) element);
}

@Override
public CtClass<T> clone() {
return (CtClass<T>) super.clone();
Expand Down
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.code.CtRHSReceiver;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtField;
import spoon.reflect.declaration.CtModifiable;
import spoon.reflect.declaration.CtShadowable;
Expand Down Expand Up @@ -163,11 +162,6 @@ public ModifierKind getVisibility() {
return modifierHandler.getVisibility();
}

@Override
public <R extends T> void replace(CtField<R> element) {
replace((CtElement) element);
}

@Override
@DerivedProperty
public CtExpression<T> getAssignment() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package spoon.support.reflect.declaration;

import spoon.reflect.annotations.MetamodelPropertyField;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtFormalTypeDeclarer;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.declaration.CtModifiable;
Expand Down Expand Up @@ -192,11 +191,6 @@ public <C extends CtModifiable> C setExtendedModifiers(Set<CtExtendedModifier> e
return (C) this;
}

@Override
public <R extends T> void replace(CtMethod<T> element) {
replace((CtElement) element);
}

@Override
public boolean isOverriding(CtMethod<?> superMethod) {
return new ClassTypingContext(getDeclaringType()).isOverriding(this, superMethod);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,6 @@ public boolean isFinal() {
return m != null && Modifier.isFinal(m.getModifiers());
}

@Override
public void replace(CtExecutableReference<?> reference) {
super.replace(reference);
}

public Set<ModifierKind> getModifiers() {
CtExecutable<T> e = getDeclaration();
if (e != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ public Package getActualPackage() {
return Package.getPackage(getSimpleName());
}

@Override
public void replace(CtPackageReference packageReference) {
super.replace(packageReference);
}

@Override
protected AnnotatedElement getActualAnnotatedElement() {
return getActualPackage();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,6 @@ public <C extends CtTypeReference<T>> C setPackage(CtPackageReference pack) {
return (C) this;
}

@Override
public void replace(CtTypeReference<?> reference) {
super.replace(reference);
}

@Override
public CtIntersectionTypeReference<T> asCtIntersectionTypeReference() {
return (CtIntersectionTypeReference<T>) this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ public Set<ModifierKind> getModifiers() {
return Collections.emptySet();
}

@Override
public void replace(CtVariableReference<?> reference) {
super.replace(reference);
}

@Override
public CtVariableReference<T> clone() {
return (CtVariableReference<T>) super.clone();
Expand Down