refactor: CtBodyHolder.setBody(body) implemented

INRIA · Nov 9, 2016 · 927fc95 · 927fc95
1 parent ef20e87
commit 927fc95
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 2 deletions.
diff --git a/src/main/java/spoon/reflect/code/CtBodyHolder.java b/src/main/java/spoon/reflect/code/CtBodyHolder.java
@@ -27,4 +27,9 @@ public interface CtBodyHolder extends CtElement {
 	 * Gets the body of this element
 	 */
 	CtStatement getBody();
+
+	/**
+	 * Sets the body of this element.
+	 */
+	<T extends CtBodyHolder> T setBody(CtStatement body);
 }
diff --git a/src/main/java/spoon/reflect/code/CtCatch.java b/src/main/java/spoon/reflect/code/CtCatch.java
@@ -36,6 +36,7 @@ public interface CtCatch extends CtCodeElement, CtBodyHolder {
 	/**
 	 * Gets the catch's body.
 	 */
+	@Override
 	CtBlock<?> getBody();
 
 	/**

diff --git a/src/main/java/spoon/reflect/code/CtLoop.java b/src/main/java/spoon/reflect/code/CtLoop.java
@@ -26,12 +26,14 @@ public interface CtLoop extends CtStatement, TemplateParameter<Void>, CtBodyHold
 	/**
 	 * Gets the body of this loop.
 	 */
+	@Override
 	CtStatement getBody();
 
 	/**
 	 * Sets the body of this loop.
 	 */
-	<T extends CtLoop> T setBody(CtStatement body);
+	@Override
+	<T extends CtBodyHolder> T setBody(CtStatement body);
 
 	@Override
 	CtLoop clone();

diff --git a/src/main/java/spoon/reflect/code/CtTry.java b/src/main/java/spoon/reflect/code/CtTry.java
@@ -55,6 +55,7 @@ public interface CtTry extends CtStatement, TemplateParameter<Void>, CtBodyHolde
 	/**
 	 * Sets the tried body.
 	 */
+	@Override
 	CtBlock<?> getBody();
 
 	/**

diff --git a/src/main/java/spoon/reflect/declaration/CtExecutable.java b/src/main/java/spoon/reflect/declaration/CtExecutable.java
@@ -45,6 +45,7 @@ public interface CtExecutable<R> extends CtNamedElement, CtTypedElement<R>, CtBo
 	/**
 	 * Gets the body expression.
 	 */
+	@Override
 	CtBlock<R> getBody();
 
 	/**

diff --git a/src/main/java/spoon/support/reflect/code/CtCatchImpl.java b/src/main/java/spoon/support/reflect/code/CtCatchImpl.java
@@ -17,8 +17,10 @@
 package spoon.support.reflect.code;
 
 import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtBodyHolder;
 import spoon.reflect.code.CtCatch;
 import spoon.reflect.code.CtCatchVariable;
+import spoon.reflect.code.CtStatement;
 import spoon.reflect.visitor.CtVisitor;
 
 public class CtCatchImpl extends CtCodeElementImpl implements CtCatch {
@@ -43,6 +45,17 @@ public CtCatchVariable<? extends Throwable> getParameter() {
 		return parameter;
 	}
 
+	@Override
+	public <T extends CtBodyHolder> T setBody(CtStatement statement) {
+		CtBlock<?> block;
+		if (statement instanceof CtBlock<?>) {
+			block = (CtBlock<?>) statement;
+		} else {
+			block = getFactory().Code().createCtBlock(statement);
+		}
+		return setBody(block);
+	}
+
 	@Override
 	public <T extends CtCatch> T setBody(CtBlock<?> body) {
 		if (body != null) {

diff --git a/src/main/java/spoon/support/reflect/code/CtLambdaImpl.java b/src/main/java/spoon/support/reflect/code/CtLambdaImpl.java
@@ -18,8 +18,10 @@
 
 import spoon.SpoonException;
 import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtBodyHolder;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtLambda;
+import spoon.reflect.code.CtStatement;
 import spoon.reflect.declaration.CtExecutable;
 import spoon.reflect.declaration.CtNamedElement;
 import spoon.reflect.declaration.CtParameter;
@@ -64,6 +66,17 @@ public CtBlock<T> getBody() {
 		return (CtBlock<T>) body;
 	}
 
+	@Override
+	public <T extends CtBodyHolder> T setBody(CtStatement statement) {
+		CtBlock<?> block;
+		if (statement instanceof CtBlock<?>) {
+			block = (CtBlock<?>) statement;
+		} else {
+			block = getFactory().Code().createCtBlock(statement);
+		}
+		return setBody(block);
+	}
+
 	@Override
 	public <B extends T, C extends CtExecutable<T>> C setBody(CtBlock<B> body) {
 		if (expression != null && body != null) {

diff --git a/src/main/java/spoon/support/reflect/code/CtLoopImpl.java b/src/main/java/spoon/support/reflect/code/CtLoopImpl.java
@@ -16,6 +16,7 @@
  */
 package spoon.support.reflect.code;
 
+import spoon.reflect.code.CtBodyHolder;
 import spoon.reflect.code.CtCodeElement;
 import spoon.reflect.code.CtLoop;
 import spoon.reflect.code.CtStatement;
@@ -31,8 +32,9 @@ public CtStatement getBody() {
 		return body;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public <T extends CtLoop> T setBody(CtStatement body) {
+	public <T extends CtBodyHolder> T setBody(CtStatement body) {
 		if (body != null) {
 			body.setParent(this);
 		}

diff --git a/src/main/java/spoon/support/reflect/code/CtTryImpl.java b/src/main/java/spoon/support/reflect/code/CtTryImpl.java
@@ -17,8 +17,10 @@
 package spoon.support.reflect.code;
 
 import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtBodyHolder;
 import spoon.reflect.code.CtCatch;
 import spoon.reflect.code.CtCodeElement;
+import spoon.reflect.code.CtStatement;
 import spoon.reflect.code.CtTry;
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.visitor.CtVisitor;
@@ -98,6 +100,17 @@ public CtBlock<?> getBody() {
 		return body;
 	}
 
+	@Override
+	public <T extends CtBodyHolder> T setBody(CtStatement statement) {
+		CtBlock<?> block;
+		if (statement instanceof CtBlock<?>) {
+			block = (CtBlock<?>) statement;
+		} else {
+			block = getFactory().Code().createCtBlock(statement);
+		}
+		return setBody(block);
+	}
+
 	@Override
 	public <T extends CtTry> T setBody(CtBlock<?> body) {
 		if (body != null) {

diff --git a/src/main/java/spoon/support/reflect/declaration/CtExecutableImpl.java b/src/main/java/spoon/support/reflect/declaration/CtExecutableImpl.java
@@ -23,6 +23,8 @@
 import java.util.Set;
 
 import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtBodyHolder;
+import spoon.reflect.code.CtStatement;
 import spoon.reflect.declaration.CtExecutable;
 import spoon.reflect.declaration.CtParameter;
 import spoon.reflect.reference.CtExecutableReference;
@@ -54,6 +56,17 @@ public CtBlock<R> getBody() {
 		return (CtBlock<R>) body;
 	}
 
+	@Override
+	public <T extends CtBodyHolder> T setBody(CtStatement statement) {
+		CtBlock<?> block;
+		if (statement instanceof CtBlock<?>) {
+			block = (CtBlock<?>) statement;
+		} else {
+			block = getFactory().Code().createCtBlock(statement);
+		}
+		return setBody(block);
+	}
+
 	@Override
 	public <B extends R, T extends CtExecutable<R>> T setBody(CtBlock<B> body) {
 		if (body != null) {
-Original file line number
+Diff line change
@@ Expand Up @@
     	/**
     	 * Gets the catch's body.
     	 */
+    	@Override
     	CtBlock<?> getBody();
     	/**
@@ Expand Down @@