undo unnecessary changes

INRIA · Dec 21, 2021 · f373be3 · f373be3
1 parent 8ce9952
commit f373be3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/spoon/reflect/meta/impl/ModelRoleHandlers.java b/src/main/java/spoon/reflect/meta/impl/ModelRoleHandlers.java
@@ -356,7 +356,7 @@ public <T, U> void setValue(T element, U value) {
 		}
 	}
 
-	static class CtTryWithResource_TRY_RESOURCE_RoleHandler extends ListHandler<CtTryWithResource, CtResource<?>> {
+	static class CtTryWithResource_TRY_RESOURCE_RoleHandler extends ListHandler<CtTryWithResource, CtResource<? extends Object>> {
 		private CtTryWithResource_TRY_RESOURCE_RoleHandler() {
 			super(CtRole.TRY_RESOURCE, CtTryWithResource.class, CtResource.class);
 		}

diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -1782,7 +1782,7 @@ public void visitCtTryWithResource(CtTryWithResource tryWithResource) {
 		if (tryWithResource.getResources() != null && !tryWithResource.getResources().isEmpty()) {
 			elementPrinterHelper.printList(tryWithResource.getResources(),
 				null, false, "(", false, false, ";", false, false, ")",
-					r -> scan(r));
+				r -> scan(r));
 		}
 		printer.writeSpace();
 		scan(tryWithResource.getBody());

diff --git a/src/main/java/spoon/support/compiler/jdt/ParentExiter.java b/src/main/java/spoon/support/compiler/jdt/ParentExiter.java
@@ -58,6 +58,7 @@
 import spoon.reflect.code.CtLoop;
 import spoon.reflect.code.CtNewArray;
 import spoon.reflect.code.CtNewClass;
+import spoon.reflect.code.CtResource;
 import spoon.reflect.code.CtReturn;
 import spoon.reflect.code.CtStatement;
 import spoon.reflect.code.CtSuperAccess;
@@ -72,7 +73,6 @@
 import spoon.reflect.code.CtTypeAccess;
 import spoon.reflect.code.CtTypePattern;
 import spoon.reflect.code.CtUnaryOperator;
-import spoon.reflect.code.CtVariableRead;
 import spoon.reflect.code.CtWhile;
 import spoon.reflect.code.CtYieldStatement;
 import spoon.reflect.cu.CompilationUnit;
@@ -973,10 +973,8 @@ private CtCatch getLastCatcher(CtTry tryBlock) {
 
 	@Override
 	public void visitCtTryWithResource(CtTryWithResource tryWithResource) {
-		if (child instanceof CtLocalVariable<?>) {
-			tryWithResource.addResource((CtLocalVariable<?>) child);
-		} else if (child instanceof CtVariableRead) {
-			tryWithResource.addResource((CtVariableRead<?>) child);
+		if (child instanceof CtResource) {
+			tryWithResource.addResource((CtResource<?>) child);
 		}
 		super.visitCtTryWithResource(tryWithResource);
 	}