From affafc878dd453ec79cbedb35b04630107190d10 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Mon, 19 Dec 2016 17:27:45 +0100 Subject: [PATCH] refactor: regenerate files with short this for future clean diffs (#1039) --- .../visitor/DefaultJavaPrettyPrinter.java | 6 +- .../support/visitor/clone/CloneBuilder.java | 2 +- .../support/visitor/clone/CloneVisitor.java | 284 +++++++++--------- .../visitor/replace/ReplacementVisitor.java | 5 +- .../spoon/processing/CtGenerationTest.java | 5 +- 5 files changed, 154 insertions(+), 148 deletions(-) diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java index c3901075661..5f8430475b8 100644 --- a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java +++ b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java @@ -759,8 +759,12 @@ public void visitCtThisAccess(CtThisAccess thisAccess) { // complex case of qualifed this if (context.currentThis.peekLast() != null && !context.currentThis.peekLast().type.getQualifiedName().equals(targetType.getQualifiedName())) { + printer.snapshotLength(); visitCtTypeReferenceWithoutGenerics(targetType); - printer.write(".this"); + if (printer.hasNewContent()) { + printer.write("."); + } + printer.write("this"); return; } diff --git a/src/main/java/spoon/support/visitor/clone/CloneBuilder.java b/src/main/java/spoon/support/visitor/clone/CloneBuilder.java index ca940418aca..10461b5aa3b 100644 --- a/src/main/java/spoon/support/visitor/clone/CloneBuilder.java +++ b/src/main/java/spoon/support/visitor/clone/CloneBuilder.java @@ -38,7 +38,7 @@ public static T build(spoon.supp private spoon.reflect.declaration.CtElement other; public void setOther(spoon.reflect.declaration.CtElement other) { - spoon.support.visitor.clone.CloneBuilder.this.other = other; + this.other = other; } // auto-generated, see spoon.generating.CloneVisitorGenerator diff --git a/src/main/java/spoon/support/visitor/clone/CloneVisitor.java b/src/main/java/spoon/support/visitor/clone/CloneVisitor.java index 4e469fdc380..42a146b16df 100644 --- a/src/main/java/spoon/support/visitor/clone/CloneVisitor.java +++ b/src/main/java/spoon/support/visitor/clone/CloneVisitor.java @@ -35,167 +35,167 @@ public T getClone() { // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAnnotation(final spoon.reflect.declaration.CtAnnotation annotation) { - spoon.reflect.declaration.CtAnnotation aCtAnnotation = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, annotation, annotation.getFactory().Core().createAnnotation()); + spoon.reflect.declaration.CtAnnotation aCtAnnotation = spoon.support.visitor.clone.CloneBuilder.build(this.builder, annotation, annotation.getFactory().Core().createAnnotation()); aCtAnnotation.setType(spoon.support.visitor.equals.CloneHelper.clone(annotation.getType())); aCtAnnotation.setComments(spoon.support.visitor.equals.CloneHelper.clone(annotation.getComments())); aCtAnnotation.setAnnotationType(spoon.support.visitor.equals.CloneHelper.clone(annotation.getAnnotationType())); aCtAnnotation.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(annotation.getAnnotations())); aCtAnnotation.setValues(spoon.support.visitor.equals.CloneHelper.clone(annotation.getValues())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAnnotation; + this.other = aCtAnnotation; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAnnotationType(final spoon.reflect.declaration.CtAnnotationType annotationType) { - spoon.reflect.declaration.CtAnnotationType aCtAnnotationType = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, annotationType, annotationType.getFactory().Core().createAnnotationType()); + spoon.reflect.declaration.CtAnnotationType aCtAnnotationType = spoon.support.visitor.clone.CloneBuilder.build(this.builder, annotationType, annotationType.getFactory().Core().createAnnotationType()); aCtAnnotationType.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(annotationType.getAnnotations())); aCtAnnotationType.setTypeMembers(spoon.support.visitor.equals.CloneHelper.clone(annotationType.getTypeMembers())); aCtAnnotationType.setComments(spoon.support.visitor.equals.CloneHelper.clone(annotationType.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAnnotationType; + this.other = aCtAnnotationType; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAnonymousExecutable(final spoon.reflect.declaration.CtAnonymousExecutable anonymousExec) { - spoon.reflect.declaration.CtAnonymousExecutable aCtAnonymousExecutable = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, anonymousExec, anonymousExec.getFactory().Core().createAnonymousExecutable()); + spoon.reflect.declaration.CtAnonymousExecutable aCtAnonymousExecutable = spoon.support.visitor.clone.CloneBuilder.build(this.builder, anonymousExec, anonymousExec.getFactory().Core().createAnonymousExecutable()); aCtAnonymousExecutable.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(anonymousExec.getAnnotations())); aCtAnonymousExecutable.setBody(spoon.support.visitor.equals.CloneHelper.clone(anonymousExec.getBody())); aCtAnonymousExecutable.setComments(spoon.support.visitor.equals.CloneHelper.clone(anonymousExec.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAnonymousExecutable; + this.other = aCtAnonymousExecutable; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtArrayRead(final spoon.reflect.code.CtArrayRead arrayRead) { - spoon.reflect.code.CtArrayRead aCtArrayRead = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, arrayRead, arrayRead.getFactory().Core().createArrayRead()); + spoon.reflect.code.CtArrayRead aCtArrayRead = spoon.support.visitor.clone.CloneBuilder.build(this.builder, arrayRead, arrayRead.getFactory().Core().createArrayRead()); aCtArrayRead.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getAnnotations())); aCtArrayRead.setType(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getType())); aCtArrayRead.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getTypeCasts())); aCtArrayRead.setTarget(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getTarget())); aCtArrayRead.setIndexExpression(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getIndexExpression())); aCtArrayRead.setComments(spoon.support.visitor.equals.CloneHelper.clone(arrayRead.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtArrayRead; + this.other = aCtArrayRead; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtArrayWrite(final spoon.reflect.code.CtArrayWrite arrayWrite) { - spoon.reflect.code.CtArrayWrite aCtArrayWrite = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, arrayWrite, arrayWrite.getFactory().Core().createArrayWrite()); + spoon.reflect.code.CtArrayWrite aCtArrayWrite = spoon.support.visitor.clone.CloneBuilder.build(this.builder, arrayWrite, arrayWrite.getFactory().Core().createArrayWrite()); aCtArrayWrite.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getAnnotations())); aCtArrayWrite.setType(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getType())); aCtArrayWrite.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getTypeCasts())); aCtArrayWrite.setTarget(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getTarget())); aCtArrayWrite.setIndexExpression(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getIndexExpression())); aCtArrayWrite.setComments(spoon.support.visitor.equals.CloneHelper.clone(arrayWrite.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtArrayWrite; + this.other = aCtArrayWrite; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtArrayTypeReference(final spoon.reflect.reference.CtArrayTypeReference reference) { - spoon.reflect.reference.CtArrayTypeReference aCtArrayTypeReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createArrayTypeReference()); + spoon.reflect.reference.CtArrayTypeReference aCtArrayTypeReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createArrayTypeReference()); aCtArrayTypeReference.setComments(spoon.support.visitor.equals.CloneHelper.clone(reference.getComments())); aCtArrayTypeReference.setPackage(spoon.support.visitor.equals.CloneHelper.clone(reference.getPackage())); aCtArrayTypeReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringType())); aCtArrayTypeReference.setComponentType(spoon.support.visitor.equals.CloneHelper.clone(reference.getComponentType())); aCtArrayTypeReference.setActualTypeArguments(spoon.support.visitor.equals.CloneHelper.clone(reference.getActualTypeArguments())); aCtArrayTypeReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtArrayTypeReference; + this.other = aCtArrayTypeReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAssert(final spoon.reflect.code.CtAssert asserted) { - spoon.reflect.code.CtAssert aCtAssert = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, asserted, asserted.getFactory().Core().createAssert()); + spoon.reflect.code.CtAssert aCtAssert = spoon.support.visitor.clone.CloneBuilder.build(this.builder, asserted, asserted.getFactory().Core().createAssert()); aCtAssert.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(asserted.getAnnotations())); aCtAssert.setAssertExpression(spoon.support.visitor.equals.CloneHelper.clone(asserted.getAssertExpression())); aCtAssert.setExpression(spoon.support.visitor.equals.CloneHelper.clone(asserted.getExpression())); aCtAssert.setComments(spoon.support.visitor.equals.CloneHelper.clone(asserted.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAssert; + this.other = aCtAssert; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAssignment(final spoon.reflect.code.CtAssignment assignement) { - spoon.reflect.code.CtAssignment aCtAssignment = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, assignement, assignement.getFactory().Core().createAssignment()); + spoon.reflect.code.CtAssignment aCtAssignment = spoon.support.visitor.clone.CloneBuilder.build(this.builder, assignement, assignement.getFactory().Core().createAssignment()); aCtAssignment.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(assignement.getAnnotations())); aCtAssignment.setType(spoon.support.visitor.equals.CloneHelper.clone(assignement.getType())); aCtAssignment.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(assignement.getTypeCasts())); aCtAssignment.setAssigned(spoon.support.visitor.equals.CloneHelper.clone(assignement.getAssigned())); aCtAssignment.setAssignment(spoon.support.visitor.equals.CloneHelper.clone(assignement.getAssignment())); aCtAssignment.setComments(spoon.support.visitor.equals.CloneHelper.clone(assignement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAssignment; + this.other = aCtAssignment; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtBinaryOperator(final spoon.reflect.code.CtBinaryOperator operator) { - spoon.reflect.code.CtBinaryOperator aCtBinaryOperator = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, operator, operator.getFactory().Core().createBinaryOperator()); + spoon.reflect.code.CtBinaryOperator aCtBinaryOperator = spoon.support.visitor.clone.CloneBuilder.build(this.builder, operator, operator.getFactory().Core().createBinaryOperator()); aCtBinaryOperator.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(operator.getAnnotations())); aCtBinaryOperator.setType(spoon.support.visitor.equals.CloneHelper.clone(operator.getType())); aCtBinaryOperator.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(operator.getTypeCasts())); aCtBinaryOperator.setLeftHandOperand(spoon.support.visitor.equals.CloneHelper.clone(operator.getLeftHandOperand())); aCtBinaryOperator.setRightHandOperand(spoon.support.visitor.equals.CloneHelper.clone(operator.getRightHandOperand())); aCtBinaryOperator.setComments(spoon.support.visitor.equals.CloneHelper.clone(operator.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtBinaryOperator; + this.other = aCtBinaryOperator; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtBlock(final spoon.reflect.code.CtBlock block) { - spoon.reflect.code.CtBlock aCtBlock = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, block, block.getFactory().Core().createBlock()); + spoon.reflect.code.CtBlock aCtBlock = spoon.support.visitor.clone.CloneBuilder.build(this.builder, block, block.getFactory().Core().createBlock()); aCtBlock.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(block.getAnnotations())); aCtBlock.setStatements(spoon.support.visitor.equals.CloneHelper.clone(block.getStatements())); aCtBlock.setComments(spoon.support.visitor.equals.CloneHelper.clone(block.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtBlock; + this.other = aCtBlock; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtBreak(final spoon.reflect.code.CtBreak breakStatement) { - spoon.reflect.code.CtBreak aCtBreak = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, breakStatement, breakStatement.getFactory().Core().createBreak()); + spoon.reflect.code.CtBreak aCtBreak = spoon.support.visitor.clone.CloneBuilder.build(this.builder, breakStatement, breakStatement.getFactory().Core().createBreak()); aCtBreak.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(breakStatement.getAnnotations())); aCtBreak.setComments(spoon.support.visitor.equals.CloneHelper.clone(breakStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtBreak; + this.other = aCtBreak; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCase(final spoon.reflect.code.CtCase caseStatement) { - spoon.reflect.code.CtCase aCtCase = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, caseStatement, caseStatement.getFactory().Core().createCase()); + spoon.reflect.code.CtCase aCtCase = spoon.support.visitor.clone.CloneBuilder.build(this.builder, caseStatement, caseStatement.getFactory().Core().createCase()); aCtCase.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(caseStatement.getAnnotations())); aCtCase.setCaseExpression(spoon.support.visitor.equals.CloneHelper.clone(caseStatement.getCaseExpression())); aCtCase.setStatements(spoon.support.visitor.equals.CloneHelper.clone(caseStatement.getStatements())); aCtCase.setComments(spoon.support.visitor.equals.CloneHelper.clone(caseStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCase; + this.other = aCtCase; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCatch(final spoon.reflect.code.CtCatch catchBlock) { - spoon.reflect.code.CtCatch aCtCatch = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, catchBlock, catchBlock.getFactory().Core().createCatch()); + spoon.reflect.code.CtCatch aCtCatch = spoon.support.visitor.clone.CloneBuilder.build(this.builder, catchBlock, catchBlock.getFactory().Core().createCatch()); aCtCatch.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(catchBlock.getAnnotations())); aCtCatch.setParameter(spoon.support.visitor.equals.CloneHelper.clone(catchBlock.getParameter())); aCtCatch.setBody(spoon.support.visitor.equals.CloneHelper.clone(catchBlock.getBody())); aCtCatch.setComments(spoon.support.visitor.equals.CloneHelper.clone(catchBlock.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCatch; + this.other = aCtCatch; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtClass(final spoon.reflect.declaration.CtClass ctClass) { - spoon.reflect.declaration.CtClass aCtClass = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ctClass, ctClass.getFactory().Core().createClass()); + spoon.reflect.declaration.CtClass aCtClass = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ctClass, ctClass.getFactory().Core().createClass()); aCtClass.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getAnnotations())); aCtClass.setSuperclass(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getSuperclass())); aCtClass.setSuperInterfaces(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getSuperInterfaces())); aCtClass.setFormalCtTypeParameters(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getFormalCtTypeParameters())); aCtClass.setTypeMembers(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getTypeMembers())); aCtClass.setComments(spoon.support.visitor.equals.CloneHelper.clone(ctClass.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtClass; + this.other = aCtClass; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtTypeParameter(spoon.reflect.declaration.CtTypeParameter typeParameter) { - spoon.reflect.declaration.CtTypeParameter aCtTypeParameter = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, typeParameter, typeParameter.getFactory().Core().createTypeParameter()); + spoon.reflect.declaration.CtTypeParameter aCtTypeParameter = spoon.support.visitor.clone.CloneBuilder.build(this.builder, typeParameter, typeParameter.getFactory().Core().createTypeParameter()); aCtTypeParameter.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(typeParameter.getAnnotations())); aCtTypeParameter.setSuperclass(spoon.support.visitor.equals.CloneHelper.clone(typeParameter.getSuperclass())); aCtTypeParameter.setComments(spoon.support.visitor.equals.CloneHelper.clone(typeParameter.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTypeParameter; + this.other = aCtTypeParameter; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtConditional(final spoon.reflect.code.CtConditional conditional) { - spoon.reflect.code.CtConditional aCtConditional = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, conditional, conditional.getFactory().Core().createConditional()); + spoon.reflect.code.CtConditional aCtConditional = spoon.support.visitor.clone.CloneBuilder.build(this.builder, conditional, conditional.getFactory().Core().createConditional()); aCtConditional.setType(spoon.support.visitor.equals.CloneHelper.clone(conditional.getType())); aCtConditional.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(conditional.getAnnotations())); aCtConditional.setCondition(spoon.support.visitor.equals.CloneHelper.clone(conditional.getCondition())); @@ -203,225 +203,225 @@ public void visitCtConditional(final spoon.reflect.code.CtConditional con aCtConditional.setElseExpression(spoon.support.visitor.equals.CloneHelper.clone(conditional.getElseExpression())); aCtConditional.setComments(spoon.support.visitor.equals.CloneHelper.clone(conditional.getComments())); aCtConditional.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(conditional.getTypeCasts())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtConditional; + this.other = aCtConditional; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtConstructor(final spoon.reflect.declaration.CtConstructor c) { - spoon.reflect.declaration.CtConstructor aCtConstructor = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, c, c.getFactory().Core().createConstructor()); + spoon.reflect.declaration.CtConstructor aCtConstructor = spoon.support.visitor.clone.CloneBuilder.build(this.builder, c, c.getFactory().Core().createConstructor()); aCtConstructor.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(c.getAnnotations())); aCtConstructor.setParameters(spoon.support.visitor.equals.CloneHelper.clone(c.getParameters())); aCtConstructor.setThrownTypes(spoon.support.visitor.equals.CloneHelper.clone(c.getThrownTypes())); aCtConstructor.setFormalCtTypeParameters(spoon.support.visitor.equals.CloneHelper.clone(c.getFormalCtTypeParameters())); aCtConstructor.setBody(spoon.support.visitor.equals.CloneHelper.clone(c.getBody())); aCtConstructor.setComments(spoon.support.visitor.equals.CloneHelper.clone(c.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtConstructor; + this.other = aCtConstructor; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtContinue(final spoon.reflect.code.CtContinue continueStatement) { - spoon.reflect.code.CtContinue aCtContinue = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, continueStatement, continueStatement.getFactory().Core().createContinue()); + spoon.reflect.code.CtContinue aCtContinue = spoon.support.visitor.clone.CloneBuilder.build(this.builder, continueStatement, continueStatement.getFactory().Core().createContinue()); aCtContinue.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(continueStatement.getAnnotations())); aCtContinue.setLabelledStatement(spoon.support.visitor.equals.CloneHelper.clone(continueStatement.getLabelledStatement())); aCtContinue.setComments(spoon.support.visitor.equals.CloneHelper.clone(continueStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtContinue; + this.other = aCtContinue; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtDo(final spoon.reflect.code.CtDo doLoop) { - spoon.reflect.code.CtDo aCtDo = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, doLoop, doLoop.getFactory().Core().createDo()); + spoon.reflect.code.CtDo aCtDo = spoon.support.visitor.clone.CloneBuilder.build(this.builder, doLoop, doLoop.getFactory().Core().createDo()); aCtDo.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(doLoop.getAnnotations())); aCtDo.setLoopingExpression(spoon.support.visitor.equals.CloneHelper.clone(doLoop.getLoopingExpression())); aCtDo.setBody(spoon.support.visitor.equals.CloneHelper.clone(doLoop.getBody())); aCtDo.setComments(spoon.support.visitor.equals.CloneHelper.clone(doLoop.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtDo; + this.other = aCtDo; } // auto-generated, see spoon.generating.CloneVisitorGenerator public > void visitCtEnum(final spoon.reflect.declaration.CtEnum ctEnum) { - spoon.reflect.declaration.CtEnum aCtEnum = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ctEnum, ctEnum.getFactory().Core().createEnum()); + spoon.reflect.declaration.CtEnum aCtEnum = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ctEnum, ctEnum.getFactory().Core().createEnum()); aCtEnum.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ctEnum.getAnnotations())); aCtEnum.setSuperInterfaces(spoon.support.visitor.equals.CloneHelper.clone(ctEnum.getSuperInterfaces())); aCtEnum.setTypeMembers(spoon.support.visitor.equals.CloneHelper.clone(ctEnum.getTypeMembers())); aCtEnum.setEnumValues(spoon.support.visitor.equals.CloneHelper.clone(ctEnum.getEnumValues())); aCtEnum.setComments(spoon.support.visitor.equals.CloneHelper.clone(ctEnum.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtEnum; + this.other = aCtEnum; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtExecutableReference(final spoon.reflect.reference.CtExecutableReference reference) { - spoon.reflect.reference.CtExecutableReference aCtExecutableReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createExecutableReference()); + spoon.reflect.reference.CtExecutableReference aCtExecutableReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createExecutableReference()); aCtExecutableReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringType())); aCtExecutableReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); aCtExecutableReference.setParameters(spoon.support.visitor.equals.CloneHelper.clone(reference.getParameters())); aCtExecutableReference.setActualTypeArguments(spoon.support.visitor.equals.CloneHelper.clone(reference.getActualTypeArguments())); aCtExecutableReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); aCtExecutableReference.setComments(spoon.support.visitor.equals.CloneHelper.clone(reference.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtExecutableReference; + this.other = aCtExecutableReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtField(final spoon.reflect.declaration.CtField f) { - spoon.reflect.declaration.CtField aCtField = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, f, f.getFactory().Core().createField()); + spoon.reflect.declaration.CtField aCtField = spoon.support.visitor.clone.CloneBuilder.build(this.builder, f, f.getFactory().Core().createField()); aCtField.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(f.getAnnotations())); aCtField.setType(spoon.support.visitor.equals.CloneHelper.clone(f.getType())); aCtField.setDefaultExpression(spoon.support.visitor.equals.CloneHelper.clone(f.getDefaultExpression())); aCtField.setComments(spoon.support.visitor.equals.CloneHelper.clone(f.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtField; + this.other = aCtField; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtEnumValue(final spoon.reflect.declaration.CtEnumValue enumValue) { - spoon.reflect.declaration.CtEnumValue aCtEnumValue = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, enumValue, enumValue.getFactory().Core().createEnumValue()); + spoon.reflect.declaration.CtEnumValue aCtEnumValue = spoon.support.visitor.clone.CloneBuilder.build(this.builder, enumValue, enumValue.getFactory().Core().createEnumValue()); aCtEnumValue.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(enumValue.getAnnotations())); aCtEnumValue.setType(spoon.support.visitor.equals.CloneHelper.clone(enumValue.getType())); aCtEnumValue.setDefaultExpression(spoon.support.visitor.equals.CloneHelper.clone(enumValue.getDefaultExpression())); aCtEnumValue.setComments(spoon.support.visitor.equals.CloneHelper.clone(enumValue.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtEnumValue; + this.other = aCtEnumValue; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtThisAccess(final spoon.reflect.code.CtThisAccess thisAccess) { - spoon.reflect.code.CtThisAccess aCtThisAccess = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, thisAccess, thisAccess.getFactory().Core().createThisAccess()); + spoon.reflect.code.CtThisAccess aCtThisAccess = spoon.support.visitor.clone.CloneBuilder.build(this.builder, thisAccess, thisAccess.getFactory().Core().createThisAccess()); aCtThisAccess.setComments(spoon.support.visitor.equals.CloneHelper.clone(thisAccess.getComments())); aCtThisAccess.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(thisAccess.getAnnotations())); aCtThisAccess.setType(spoon.support.visitor.equals.CloneHelper.clone(thisAccess.getType())); aCtThisAccess.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(thisAccess.getTypeCasts())); aCtThisAccess.setTarget(spoon.support.visitor.equals.CloneHelper.clone(thisAccess.getTarget())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtThisAccess; + this.other = aCtThisAccess; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtAnnotationFieldAccess(final spoon.reflect.code.CtAnnotationFieldAccess annotationFieldAccess) { - spoon.reflect.code.CtAnnotationFieldAccess aCtAnnotationFieldAccess = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, annotationFieldAccess, annotationFieldAccess.getFactory().Core().createAnnotationFieldAccess()); + spoon.reflect.code.CtAnnotationFieldAccess aCtAnnotationFieldAccess = spoon.support.visitor.clone.CloneBuilder.build(this.builder, annotationFieldAccess, annotationFieldAccess.getFactory().Core().createAnnotationFieldAccess()); aCtAnnotationFieldAccess.setComments(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getComments())); aCtAnnotationFieldAccess.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getAnnotations())); aCtAnnotationFieldAccess.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getTypeCasts())); aCtAnnotationFieldAccess.setTarget(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getTarget())); aCtAnnotationFieldAccess.setType(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getType())); aCtAnnotationFieldAccess.setVariable(spoon.support.visitor.equals.CloneHelper.clone(annotationFieldAccess.getVariable())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAnnotationFieldAccess; + this.other = aCtAnnotationFieldAccess; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtFieldReference(final spoon.reflect.reference.CtFieldReference reference) { - spoon.reflect.reference.CtFieldReference aCtFieldReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createFieldReference()); + spoon.reflect.reference.CtFieldReference aCtFieldReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createFieldReference()); aCtFieldReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringType())); aCtFieldReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); aCtFieldReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtFieldReference; + this.other = aCtFieldReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtFor(final spoon.reflect.code.CtFor forLoop) { - spoon.reflect.code.CtFor aCtFor = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, forLoop, forLoop.getFactory().Core().createFor()); + spoon.reflect.code.CtFor aCtFor = spoon.support.visitor.clone.CloneBuilder.build(this.builder, forLoop, forLoop.getFactory().Core().createFor()); aCtFor.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getAnnotations())); aCtFor.setForInit(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getForInit())); aCtFor.setExpression(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getExpression())); aCtFor.setForUpdate(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getForUpdate())); aCtFor.setBody(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getBody())); aCtFor.setComments(spoon.support.visitor.equals.CloneHelper.clone(forLoop.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtFor; + this.other = aCtFor; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtForEach(final spoon.reflect.code.CtForEach foreach) { - spoon.reflect.code.CtForEach aCtForEach = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, foreach, foreach.getFactory().Core().createForEach()); + spoon.reflect.code.CtForEach aCtForEach = spoon.support.visitor.clone.CloneBuilder.build(this.builder, foreach, foreach.getFactory().Core().createForEach()); aCtForEach.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(foreach.getAnnotations())); aCtForEach.setVariable(spoon.support.visitor.equals.CloneHelper.clone(foreach.getVariable())); aCtForEach.setExpression(spoon.support.visitor.equals.CloneHelper.clone(foreach.getExpression())); aCtForEach.setBody(spoon.support.visitor.equals.CloneHelper.clone(foreach.getBody())); aCtForEach.setComments(spoon.support.visitor.equals.CloneHelper.clone(foreach.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtForEach; + this.other = aCtForEach; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtIf(final spoon.reflect.code.CtIf ifElement) { - spoon.reflect.code.CtIf aCtIf = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ifElement, ifElement.getFactory().Core().createIf()); + spoon.reflect.code.CtIf aCtIf = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ifElement, ifElement.getFactory().Core().createIf()); aCtIf.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ifElement.getAnnotations())); aCtIf.setCondition(spoon.support.visitor.equals.CloneHelper.clone(ifElement.getCondition())); aCtIf.setThenStatement(spoon.support.visitor.equals.CloneHelper.clone(((spoon.reflect.code.CtStatement) (ifElement.getThenStatement())))); aCtIf.setElseStatement(spoon.support.visitor.equals.CloneHelper.clone(((spoon.reflect.code.CtStatement) (ifElement.getElseStatement())))); aCtIf.setComments(spoon.support.visitor.equals.CloneHelper.clone(ifElement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtIf; + this.other = aCtIf; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtInterface(final spoon.reflect.declaration.CtInterface intrface) { - spoon.reflect.declaration.CtInterface aCtInterface = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, intrface, intrface.getFactory().Core().createInterface()); + spoon.reflect.declaration.CtInterface aCtInterface = spoon.support.visitor.clone.CloneBuilder.build(this.builder, intrface, intrface.getFactory().Core().createInterface()); aCtInterface.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(intrface.getAnnotations())); aCtInterface.setSuperInterfaces(spoon.support.visitor.equals.CloneHelper.clone(intrface.getSuperInterfaces())); aCtInterface.setFormalCtTypeParameters(spoon.support.visitor.equals.CloneHelper.clone(intrface.getFormalCtTypeParameters())); aCtInterface.setTypeMembers(spoon.support.visitor.equals.CloneHelper.clone(intrface.getTypeMembers())); aCtInterface.setComments(spoon.support.visitor.equals.CloneHelper.clone(intrface.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtInterface; + this.other = aCtInterface; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtInvocation(final spoon.reflect.code.CtInvocation invocation) { - spoon.reflect.code.CtInvocation aCtInvocation = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, invocation, invocation.getFactory().Core().createInvocation()); + spoon.reflect.code.CtInvocation aCtInvocation = spoon.support.visitor.clone.CloneBuilder.build(this.builder, invocation, invocation.getFactory().Core().createInvocation()); aCtInvocation.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(invocation.getAnnotations())); aCtInvocation.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(invocation.getTypeCasts())); aCtInvocation.setTarget(spoon.support.visitor.equals.CloneHelper.clone(invocation.getTarget())); aCtInvocation.setExecutable(spoon.support.visitor.equals.CloneHelper.clone(invocation.getExecutable())); aCtInvocation.setArguments(spoon.support.visitor.equals.CloneHelper.clone(invocation.getArguments())); aCtInvocation.setComments(spoon.support.visitor.equals.CloneHelper.clone(invocation.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtInvocation; + this.other = aCtInvocation; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtLiteral(final spoon.reflect.code.CtLiteral literal) { - spoon.reflect.code.CtLiteral aCtLiteral = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, literal, literal.getFactory().Core().createLiteral()); + spoon.reflect.code.CtLiteral aCtLiteral = spoon.support.visitor.clone.CloneBuilder.build(this.builder, literal, literal.getFactory().Core().createLiteral()); aCtLiteral.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(literal.getAnnotations())); aCtLiteral.setType(spoon.support.visitor.equals.CloneHelper.clone(literal.getType())); aCtLiteral.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(literal.getTypeCasts())); aCtLiteral.setComments(spoon.support.visitor.equals.CloneHelper.clone(literal.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtLiteral; + this.other = aCtLiteral; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtLocalVariable(final spoon.reflect.code.CtLocalVariable localVariable) { - spoon.reflect.code.CtLocalVariable aCtLocalVariable = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, localVariable, localVariable.getFactory().Core().createLocalVariable()); + spoon.reflect.code.CtLocalVariable aCtLocalVariable = spoon.support.visitor.clone.CloneBuilder.build(this.builder, localVariable, localVariable.getFactory().Core().createLocalVariable()); aCtLocalVariable.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(localVariable.getAnnotations())); aCtLocalVariable.setType(spoon.support.visitor.equals.CloneHelper.clone(localVariable.getType())); aCtLocalVariable.setDefaultExpression(spoon.support.visitor.equals.CloneHelper.clone(localVariable.getDefaultExpression())); aCtLocalVariable.setComments(spoon.support.visitor.equals.CloneHelper.clone(localVariable.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtLocalVariable; + this.other = aCtLocalVariable; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtLocalVariableReference(final spoon.reflect.reference.CtLocalVariableReference reference) { - spoon.reflect.reference.CtLocalVariableReference aCtLocalVariableReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createLocalVariableReference()); + spoon.reflect.reference.CtLocalVariableReference aCtLocalVariableReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createLocalVariableReference()); aCtLocalVariableReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); aCtLocalVariableReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtLocalVariableReference; + this.other = aCtLocalVariableReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCatchVariable(final spoon.reflect.code.CtCatchVariable catchVariable) { - spoon.reflect.code.CtCatchVariable aCtCatchVariable = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, catchVariable, catchVariable.getFactory().Core().createCatchVariable()); + spoon.reflect.code.CtCatchVariable aCtCatchVariable = spoon.support.visitor.clone.CloneBuilder.build(this.builder, catchVariable, catchVariable.getFactory().Core().createCatchVariable()); aCtCatchVariable.setComments(spoon.support.visitor.equals.CloneHelper.clone(catchVariable.getComments())); aCtCatchVariable.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(catchVariable.getAnnotations())); aCtCatchVariable.setDefaultExpression(spoon.support.visitor.equals.CloneHelper.clone(catchVariable.getDefaultExpression())); aCtCatchVariable.setType(spoon.support.visitor.equals.CloneHelper.clone(catchVariable.getType())); aCtCatchVariable.setMultiTypes(spoon.support.visitor.equals.CloneHelper.clone(catchVariable.getMultiTypes())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCatchVariable; + this.other = aCtCatchVariable; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCatchVariableReference(final spoon.reflect.reference.CtCatchVariableReference reference) { - spoon.reflect.reference.CtCatchVariableReference aCtCatchVariableReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createCatchVariableReference()); + spoon.reflect.reference.CtCatchVariableReference aCtCatchVariableReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createCatchVariableReference()); aCtCatchVariableReference.setComments(spoon.support.visitor.equals.CloneHelper.clone(reference.getComments())); aCtCatchVariableReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); aCtCatchVariableReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCatchVariableReference; + this.other = aCtCatchVariableReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtMethod(final spoon.reflect.declaration.CtMethod m) { - spoon.reflect.declaration.CtMethod aCtMethod = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, m, m.getFactory().Core().createMethod()); + spoon.reflect.declaration.CtMethod aCtMethod = spoon.support.visitor.clone.CloneBuilder.build(this.builder, m, m.getFactory().Core().createMethod()); aCtMethod.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(m.getAnnotations())); aCtMethod.setFormalCtTypeParameters(spoon.support.visitor.equals.CloneHelper.clone(m.getFormalCtTypeParameters())); aCtMethod.setType(spoon.support.visitor.equals.CloneHelper.clone(m.getType())); @@ -429,48 +429,48 @@ public void visitCtMethod(final spoon.reflect.declaration.CtMethod m) { aCtMethod.setThrownTypes(spoon.support.visitor.equals.CloneHelper.clone(m.getThrownTypes())); aCtMethod.setBody(spoon.support.visitor.equals.CloneHelper.clone(m.getBody())); aCtMethod.setComments(spoon.support.visitor.equals.CloneHelper.clone(m.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtMethod; + this.other = aCtMethod; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtAnnotationMethod(spoon.reflect.declaration.CtAnnotationMethod annotationMethod) { - spoon.reflect.declaration.CtAnnotationMethod aCtAnnotationMethod = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, annotationMethod, annotationMethod.getFactory().Core().createAnnotationMethod()); + spoon.reflect.declaration.CtAnnotationMethod aCtAnnotationMethod = spoon.support.visitor.clone.CloneBuilder.build(this.builder, annotationMethod, annotationMethod.getFactory().Core().createAnnotationMethod()); aCtAnnotationMethod.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(annotationMethod.getAnnotations())); aCtAnnotationMethod.setType(spoon.support.visitor.equals.CloneHelper.clone(annotationMethod.getType())); aCtAnnotationMethod.setDefaultExpression(spoon.support.visitor.equals.CloneHelper.clone(annotationMethod.getDefaultExpression())); aCtAnnotationMethod.setComments(spoon.support.visitor.equals.CloneHelper.clone(annotationMethod.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtAnnotationMethod; + this.other = aCtAnnotationMethod; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtNewArray(final spoon.reflect.code.CtNewArray newArray) { - spoon.reflect.code.CtNewArray aCtNewArray = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, newArray, newArray.getFactory().Core().createNewArray()); + spoon.reflect.code.CtNewArray aCtNewArray = spoon.support.visitor.clone.CloneBuilder.build(this.builder, newArray, newArray.getFactory().Core().createNewArray()); aCtNewArray.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(newArray.getAnnotations())); aCtNewArray.setType(spoon.support.visitor.equals.CloneHelper.clone(newArray.getType())); aCtNewArray.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(newArray.getTypeCasts())); aCtNewArray.setElements(spoon.support.visitor.equals.CloneHelper.clone(newArray.getElements())); aCtNewArray.setDimensionExpressions(spoon.support.visitor.equals.CloneHelper.clone(newArray.getDimensionExpressions())); aCtNewArray.setComments(spoon.support.visitor.equals.CloneHelper.clone(newArray.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtNewArray; + this.other = aCtNewArray; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtConstructorCall(final spoon.reflect.code.CtConstructorCall ctConstructorCall) { - spoon.reflect.code.CtConstructorCall aCtConstructorCall = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ctConstructorCall, ctConstructorCall.getFactory().Core().createConstructorCall()); + spoon.reflect.code.CtConstructorCall aCtConstructorCall = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ctConstructorCall, ctConstructorCall.getFactory().Core().createConstructorCall()); aCtConstructorCall.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getAnnotations())); aCtConstructorCall.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getTypeCasts())); aCtConstructorCall.setExecutable(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getExecutable())); aCtConstructorCall.setTarget(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getTarget())); aCtConstructorCall.setArguments(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getArguments())); aCtConstructorCall.setComments(spoon.support.visitor.equals.CloneHelper.clone(ctConstructorCall.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtConstructorCall; + this.other = aCtConstructorCall; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtNewClass(final spoon.reflect.code.CtNewClass newClass) { - spoon.reflect.code.CtNewClass aCtNewClass = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, newClass, newClass.getFactory().Core().createNewClass()); + spoon.reflect.code.CtNewClass aCtNewClass = spoon.support.visitor.clone.CloneBuilder.build(this.builder, newClass, newClass.getFactory().Core().createNewClass()); aCtNewClass.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(newClass.getAnnotations())); aCtNewClass.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(newClass.getTypeCasts())); aCtNewClass.setExecutable(spoon.support.visitor.equals.CloneHelper.clone(newClass.getExecutable())); @@ -478,13 +478,13 @@ public void visitCtNewClass(final spoon.reflect.code.CtNewClass newClass) aCtNewClass.setArguments(spoon.support.visitor.equals.CloneHelper.clone(newClass.getArguments())); aCtNewClass.setAnonymousClass(spoon.support.visitor.equals.CloneHelper.clone(newClass.getAnonymousClass())); aCtNewClass.setComments(spoon.support.visitor.equals.CloneHelper.clone(newClass.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtNewClass; + this.other = aCtNewClass; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtLambda(final spoon.reflect.code.CtLambda lambda) { - spoon.reflect.code.CtLambda aCtLambda = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, lambda, lambda.getFactory().Core().createLambda()); + spoon.reflect.code.CtLambda aCtLambda = spoon.support.visitor.clone.CloneBuilder.build(this.builder, lambda, lambda.getFactory().Core().createLambda()); aCtLambda.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(lambda.getAnnotations())); aCtLambda.setType(spoon.support.visitor.equals.CloneHelper.clone(lambda.getType())); aCtLambda.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(lambda.getTypeCasts())); @@ -493,306 +493,306 @@ public void visitCtLambda(final spoon.reflect.code.CtLambda lambda) { aCtLambda.setBody(spoon.support.visitor.equals.CloneHelper.clone(lambda.getBody())); aCtLambda.setExpression(spoon.support.visitor.equals.CloneHelper.clone(lambda.getExpression())); aCtLambda.setComments(spoon.support.visitor.equals.CloneHelper.clone(lambda.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtLambda; + this.other = aCtLambda; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public > void visitCtExecutableReferenceExpression(final spoon.reflect.code.CtExecutableReferenceExpression expression) { - spoon.reflect.code.CtExecutableReferenceExpression aCtExecutableReferenceExpression = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, expression, expression.getFactory().Core().createExecutableReferenceExpression()); + spoon.reflect.code.CtExecutableReferenceExpression aCtExecutableReferenceExpression = spoon.support.visitor.clone.CloneBuilder.build(this.builder, expression, expression.getFactory().Core().createExecutableReferenceExpression()); aCtExecutableReferenceExpression.setComments(spoon.support.visitor.equals.CloneHelper.clone(expression.getComments())); aCtExecutableReferenceExpression.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(expression.getAnnotations())); aCtExecutableReferenceExpression.setType(spoon.support.visitor.equals.CloneHelper.clone(expression.getType())); aCtExecutableReferenceExpression.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(expression.getTypeCasts())); aCtExecutableReferenceExpression.setExecutable(spoon.support.visitor.equals.CloneHelper.clone(expression.getExecutable())); aCtExecutableReferenceExpression.setTarget(spoon.support.visitor.equals.CloneHelper.clone(expression.getTarget())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtExecutableReferenceExpression; + this.other = aCtExecutableReferenceExpression; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtOperatorAssignment(final spoon.reflect.code.CtOperatorAssignment assignment) { - spoon.reflect.code.CtOperatorAssignment aCtOperatorAssignment = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, assignment, assignment.getFactory().Core().createOperatorAssignment()); + spoon.reflect.code.CtOperatorAssignment aCtOperatorAssignment = spoon.support.visitor.clone.CloneBuilder.build(this.builder, assignment, assignment.getFactory().Core().createOperatorAssignment()); aCtOperatorAssignment.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(assignment.getAnnotations())); aCtOperatorAssignment.setType(spoon.support.visitor.equals.CloneHelper.clone(assignment.getType())); aCtOperatorAssignment.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(assignment.getTypeCasts())); aCtOperatorAssignment.setAssigned(spoon.support.visitor.equals.CloneHelper.clone(assignment.getAssigned())); aCtOperatorAssignment.setAssignment(spoon.support.visitor.equals.CloneHelper.clone(assignment.getAssignment())); aCtOperatorAssignment.setComments(spoon.support.visitor.equals.CloneHelper.clone(assignment.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtOperatorAssignment; + this.other = aCtOperatorAssignment; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtPackage(final spoon.reflect.declaration.CtPackage ctPackage) { - spoon.reflect.declaration.CtPackage aCtPackage = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ctPackage, ctPackage.getFactory().Core().createPackage()); + spoon.reflect.declaration.CtPackage aCtPackage = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ctPackage, ctPackage.getFactory().Core().createPackage()); aCtPackage.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ctPackage.getAnnotations())); aCtPackage.setPackages(spoon.support.visitor.equals.CloneHelper.clone(ctPackage.getPackages())); aCtPackage.setTypes(spoon.support.visitor.equals.CloneHelper.clone(ctPackage.getTypes())); aCtPackage.setComments(spoon.support.visitor.equals.CloneHelper.clone(ctPackage.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtPackage; + this.other = aCtPackage; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtPackageReference(final spoon.reflect.reference.CtPackageReference reference) { - spoon.reflect.reference.CtPackageReference aCtPackageReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createPackageReference()); + spoon.reflect.reference.CtPackageReference aCtPackageReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createPackageReference()); aCtPackageReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtPackageReference; + this.other = aCtPackageReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtParameter(final spoon.reflect.declaration.CtParameter parameter) { - spoon.reflect.declaration.CtParameter aCtParameter = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, parameter, parameter.getFactory().Core().createParameter()); + spoon.reflect.declaration.CtParameter aCtParameter = spoon.support.visitor.clone.CloneBuilder.build(this.builder, parameter, parameter.getFactory().Core().createParameter()); aCtParameter.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(parameter.getAnnotations())); aCtParameter.setType(spoon.support.visitor.equals.CloneHelper.clone(parameter.getType())); aCtParameter.setComments(spoon.support.visitor.equals.CloneHelper.clone(parameter.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtParameter; + this.other = aCtParameter; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtParameterReference(final spoon.reflect.reference.CtParameterReference reference) { - spoon.reflect.reference.CtParameterReference aCtParameterReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createParameterReference()); + spoon.reflect.reference.CtParameterReference aCtParameterReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createParameterReference()); aCtParameterReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); aCtParameterReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); aCtParameterReference.setDeclaringExecutable(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringExecutable())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtParameterReference; + this.other = aCtParameterReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtReturn(final spoon.reflect.code.CtReturn returnStatement) { - spoon.reflect.code.CtReturn aCtReturn = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, returnStatement, returnStatement.getFactory().Core().createReturn()); + spoon.reflect.code.CtReturn aCtReturn = spoon.support.visitor.clone.CloneBuilder.build(this.builder, returnStatement, returnStatement.getFactory().Core().createReturn()); aCtReturn.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(returnStatement.getAnnotations())); aCtReturn.setReturnedExpression(spoon.support.visitor.equals.CloneHelper.clone(returnStatement.getReturnedExpression())); aCtReturn.setComments(spoon.support.visitor.equals.CloneHelper.clone(returnStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtReturn; + this.other = aCtReturn; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtStatementList(final spoon.reflect.code.CtStatementList statements) { - spoon.reflect.code.CtStatementList aCtStatementList = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, statements, statements.getFactory().Core().createStatementList()); + spoon.reflect.code.CtStatementList aCtStatementList = spoon.support.visitor.clone.CloneBuilder.build(this.builder, statements, statements.getFactory().Core().createStatementList()); aCtStatementList.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(statements.getAnnotations())); aCtStatementList.setStatements(spoon.support.visitor.equals.CloneHelper.clone(statements.getStatements())); aCtStatementList.setComments(spoon.support.visitor.equals.CloneHelper.clone(statements.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtStatementList; + this.other = aCtStatementList; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtSwitch(final spoon.reflect.code.CtSwitch switchStatement) { - spoon.reflect.code.CtSwitch aCtSwitch = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, switchStatement, switchStatement.getFactory().Core().createSwitch()); + spoon.reflect.code.CtSwitch aCtSwitch = spoon.support.visitor.clone.CloneBuilder.build(this.builder, switchStatement, switchStatement.getFactory().Core().createSwitch()); aCtSwitch.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(switchStatement.getAnnotations())); aCtSwitch.setSelector(spoon.support.visitor.equals.CloneHelper.clone(switchStatement.getSelector())); aCtSwitch.setCases(spoon.support.visitor.equals.CloneHelper.clone(switchStatement.getCases())); aCtSwitch.setComments(spoon.support.visitor.equals.CloneHelper.clone(switchStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtSwitch; + this.other = aCtSwitch; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtSynchronized(final spoon.reflect.code.CtSynchronized synchro) { - spoon.reflect.code.CtSynchronized aCtSynchronized = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, synchro, synchro.getFactory().Core().createSynchronized()); + spoon.reflect.code.CtSynchronized aCtSynchronized = spoon.support.visitor.clone.CloneBuilder.build(this.builder, synchro, synchro.getFactory().Core().createSynchronized()); aCtSynchronized.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(synchro.getAnnotations())); aCtSynchronized.setExpression(spoon.support.visitor.equals.CloneHelper.clone(synchro.getExpression())); aCtSynchronized.setBlock(spoon.support.visitor.equals.CloneHelper.clone(synchro.getBlock())); aCtSynchronized.setComments(spoon.support.visitor.equals.CloneHelper.clone(synchro.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtSynchronized; + this.other = aCtSynchronized; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtThrow(final spoon.reflect.code.CtThrow throwStatement) { - spoon.reflect.code.CtThrow aCtThrow = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, throwStatement, throwStatement.getFactory().Core().createThrow()); + spoon.reflect.code.CtThrow aCtThrow = spoon.support.visitor.clone.CloneBuilder.build(this.builder, throwStatement, throwStatement.getFactory().Core().createThrow()); aCtThrow.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(throwStatement.getAnnotations())); aCtThrow.setThrownExpression(spoon.support.visitor.equals.CloneHelper.clone(throwStatement.getThrownExpression())); aCtThrow.setComments(spoon.support.visitor.equals.CloneHelper.clone(throwStatement.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtThrow; + this.other = aCtThrow; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtTry(final spoon.reflect.code.CtTry tryBlock) { - spoon.reflect.code.CtTry aCtTry = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, tryBlock, tryBlock.getFactory().Core().createTry()); + spoon.reflect.code.CtTry aCtTry = spoon.support.visitor.clone.CloneBuilder.build(this.builder, tryBlock, tryBlock.getFactory().Core().createTry()); aCtTry.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(tryBlock.getAnnotations())); aCtTry.setBody(spoon.support.visitor.equals.CloneHelper.clone(tryBlock.getBody())); aCtTry.setCatchers(spoon.support.visitor.equals.CloneHelper.clone(tryBlock.getCatchers())); aCtTry.setFinalizer(spoon.support.visitor.equals.CloneHelper.clone(tryBlock.getFinalizer())); aCtTry.setComments(spoon.support.visitor.equals.CloneHelper.clone(tryBlock.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTry; + this.other = aCtTry; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtTryWithResource(final spoon.reflect.code.CtTryWithResource tryWithResource) { - spoon.reflect.code.CtTryWithResource aCtTryWithResource = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, tryWithResource, tryWithResource.getFactory().Core().createTryWithResource()); + spoon.reflect.code.CtTryWithResource aCtTryWithResource = spoon.support.visitor.clone.CloneBuilder.build(this.builder, tryWithResource, tryWithResource.getFactory().Core().createTryWithResource()); aCtTryWithResource.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getAnnotations())); aCtTryWithResource.setResources(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getResources())); aCtTryWithResource.setBody(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getBody())); aCtTryWithResource.setCatchers(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getCatchers())); aCtTryWithResource.setFinalizer(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getFinalizer())); aCtTryWithResource.setComments(spoon.support.visitor.equals.CloneHelper.clone(tryWithResource.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTryWithResource; + this.other = aCtTryWithResource; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtTypeParameterReference(final spoon.reflect.reference.CtTypeParameterReference ref) { - spoon.reflect.reference.CtTypeParameterReference aCtTypeParameterReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, ref, ref.getFactory().Core().createTypeParameterReference()); + spoon.reflect.reference.CtTypeParameterReference aCtTypeParameterReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, ref, ref.getFactory().Core().createTypeParameterReference()); aCtTypeParameterReference.setPackage(spoon.support.visitor.equals.CloneHelper.clone(ref.getPackage())); aCtTypeParameterReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(ref.getDeclaringType())); aCtTypeParameterReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(ref.getAnnotations())); aCtTypeParameterReference.setBoundingType(spoon.support.visitor.equals.CloneHelper.clone(ref.getBoundingType())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTypeParameterReference; + this.other = aCtTypeParameterReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtWildcardReference(spoon.reflect.reference.CtWildcardReference wildcardReference) { - spoon.reflect.reference.CtWildcardReference aCtWildcardReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, wildcardReference, wildcardReference.getFactory().Core().createWildcardReference()); + spoon.reflect.reference.CtWildcardReference aCtWildcardReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, wildcardReference, wildcardReference.getFactory().Core().createWildcardReference()); aCtWildcardReference.setPackage(spoon.support.visitor.equals.CloneHelper.clone(wildcardReference.getPackage())); aCtWildcardReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(wildcardReference.getDeclaringType())); aCtWildcardReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(wildcardReference.getAnnotations())); aCtWildcardReference.setBoundingType(spoon.support.visitor.equals.CloneHelper.clone(wildcardReference.getBoundingType())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtWildcardReference; + this.other = aCtWildcardReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtIntersectionTypeReference(final spoon.reflect.reference.CtIntersectionTypeReference reference) { - spoon.reflect.reference.CtIntersectionTypeReference aCtIntersectionTypeReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createIntersectionTypeReference()); + spoon.reflect.reference.CtIntersectionTypeReference aCtIntersectionTypeReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createIntersectionTypeReference()); aCtIntersectionTypeReference.setPackage(spoon.support.visitor.equals.CloneHelper.clone(reference.getPackage())); aCtIntersectionTypeReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringType())); aCtIntersectionTypeReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); aCtIntersectionTypeReference.setBounds(spoon.support.visitor.equals.CloneHelper.clone(reference.getBounds())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtIntersectionTypeReference; + this.other = aCtIntersectionTypeReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtTypeReference(final spoon.reflect.reference.CtTypeReference reference) { - spoon.reflect.reference.CtTypeReference aCtTypeReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createTypeReference()); + spoon.reflect.reference.CtTypeReference aCtTypeReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createTypeReference()); aCtTypeReference.setPackage(spoon.support.visitor.equals.CloneHelper.clone(reference.getPackage())); aCtTypeReference.setDeclaringType(spoon.support.visitor.equals.CloneHelper.clone(reference.getDeclaringType())); aCtTypeReference.setActualTypeArguments(spoon.support.visitor.equals.CloneHelper.clone(reference.getActualTypeArguments())); aCtTypeReference.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(reference.getAnnotations())); aCtTypeReference.setComments(spoon.support.visitor.equals.CloneHelper.clone(reference.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTypeReference; + this.other = aCtTypeReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtTypeAccess(final spoon.reflect.code.CtTypeAccess typeAccess) { - spoon.reflect.code.CtTypeAccess aCtTypeAccess = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, typeAccess, typeAccess.getFactory().Core().createTypeAccess()); + spoon.reflect.code.CtTypeAccess aCtTypeAccess = spoon.support.visitor.clone.CloneBuilder.build(this.builder, typeAccess, typeAccess.getFactory().Core().createTypeAccess()); aCtTypeAccess.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(typeAccess.getAnnotations())); aCtTypeAccess.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(typeAccess.getTypeCasts())); aCtTypeAccess.setAccessedType(spoon.support.visitor.equals.CloneHelper.clone(typeAccess.getAccessedType())); aCtTypeAccess.setComments(spoon.support.visitor.equals.CloneHelper.clone(typeAccess.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtTypeAccess; + this.other = aCtTypeAccess; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtUnaryOperator(final spoon.reflect.code.CtUnaryOperator operator) { - spoon.reflect.code.CtUnaryOperator aCtUnaryOperator = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, operator, operator.getFactory().Core().createUnaryOperator()); + spoon.reflect.code.CtUnaryOperator aCtUnaryOperator = spoon.support.visitor.clone.CloneBuilder.build(this.builder, operator, operator.getFactory().Core().createUnaryOperator()); aCtUnaryOperator.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(operator.getAnnotations())); aCtUnaryOperator.setType(spoon.support.visitor.equals.CloneHelper.clone(operator.getType())); aCtUnaryOperator.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(operator.getTypeCasts())); aCtUnaryOperator.setOperand(spoon.support.visitor.equals.CloneHelper.clone(operator.getOperand())); aCtUnaryOperator.setComments(spoon.support.visitor.equals.CloneHelper.clone(operator.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtUnaryOperator; + this.other = aCtUnaryOperator; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtVariableRead(final spoon.reflect.code.CtVariableRead variableRead) { - spoon.reflect.code.CtVariableRead aCtVariableRead = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, variableRead, variableRead.getFactory().Core().createVariableRead()); + spoon.reflect.code.CtVariableRead aCtVariableRead = spoon.support.visitor.clone.CloneBuilder.build(this.builder, variableRead, variableRead.getFactory().Core().createVariableRead()); aCtVariableRead.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(variableRead.getAnnotations())); aCtVariableRead.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(variableRead.getTypeCasts())); aCtVariableRead.setVariable(spoon.support.visitor.equals.CloneHelper.clone(variableRead.getVariable())); aCtVariableRead.setComments(spoon.support.visitor.equals.CloneHelper.clone(variableRead.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtVariableRead; + this.other = aCtVariableRead; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtVariableWrite(final spoon.reflect.code.CtVariableWrite variableWrite) { - spoon.reflect.code.CtVariableWrite aCtVariableWrite = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, variableWrite, variableWrite.getFactory().Core().createVariableWrite()); + spoon.reflect.code.CtVariableWrite aCtVariableWrite = spoon.support.visitor.clone.CloneBuilder.build(this.builder, variableWrite, variableWrite.getFactory().Core().createVariableWrite()); aCtVariableWrite.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(variableWrite.getAnnotations())); aCtVariableWrite.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(variableWrite.getTypeCasts())); aCtVariableWrite.setVariable(spoon.support.visitor.equals.CloneHelper.clone(variableWrite.getVariable())); aCtVariableWrite.setComments(spoon.support.visitor.equals.CloneHelper.clone(variableWrite.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtVariableWrite; + this.other = aCtVariableWrite; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtWhile(final spoon.reflect.code.CtWhile whileLoop) { - spoon.reflect.code.CtWhile aCtWhile = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, whileLoop, whileLoop.getFactory().Core().createWhile()); + spoon.reflect.code.CtWhile aCtWhile = spoon.support.visitor.clone.CloneBuilder.build(this.builder, whileLoop, whileLoop.getFactory().Core().createWhile()); aCtWhile.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(whileLoop.getAnnotations())); aCtWhile.setLoopingExpression(spoon.support.visitor.equals.CloneHelper.clone(whileLoop.getLoopingExpression())); aCtWhile.setBody(spoon.support.visitor.equals.CloneHelper.clone(whileLoop.getBody())); aCtWhile.setComments(spoon.support.visitor.equals.CloneHelper.clone(whileLoop.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtWhile; + this.other = aCtWhile; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCodeSnippetExpression(final spoon.reflect.code.CtCodeSnippetExpression expression) { - spoon.reflect.code.CtCodeSnippetExpression aCtCodeSnippetExpression = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, expression, expression.getFactory().Core().createCodeSnippetExpression()); + spoon.reflect.code.CtCodeSnippetExpression aCtCodeSnippetExpression = spoon.support.visitor.clone.CloneBuilder.build(this.builder, expression, expression.getFactory().Core().createCodeSnippetExpression()); aCtCodeSnippetExpression.setType(spoon.support.visitor.equals.CloneHelper.clone(expression.getType())); aCtCodeSnippetExpression.setComments(spoon.support.visitor.equals.CloneHelper.clone(expression.getComments())); aCtCodeSnippetExpression.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(expression.getAnnotations())); aCtCodeSnippetExpression.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(expression.getTypeCasts())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCodeSnippetExpression; + this.other = aCtCodeSnippetExpression; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtCodeSnippetStatement(final spoon.reflect.code.CtCodeSnippetStatement statement) { - spoon.reflect.code.CtCodeSnippetStatement aCtCodeSnippetStatement = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, statement, statement.getFactory().Core().createCodeSnippetStatement()); + spoon.reflect.code.CtCodeSnippetStatement aCtCodeSnippetStatement = spoon.support.visitor.clone.CloneBuilder.build(this.builder, statement, statement.getFactory().Core().createCodeSnippetStatement()); aCtCodeSnippetStatement.setComments(spoon.support.visitor.equals.CloneHelper.clone(statement.getComments())); aCtCodeSnippetStatement.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(statement.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtCodeSnippetStatement; + this.other = aCtCodeSnippetStatement; } // auto-generated, see spoon.generating.CloneVisitorGenerator public void visitCtUnboundVariableReference(final spoon.reflect.reference.CtUnboundVariableReference reference) { - spoon.reflect.reference.CtUnboundVariableReference aCtUnboundVariableReference = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, reference, reference.getFactory().Core().createUnboundVariableReference()); + spoon.reflect.reference.CtUnboundVariableReference aCtUnboundVariableReference = spoon.support.visitor.clone.CloneBuilder.build(this.builder, reference, reference.getFactory().Core().createUnboundVariableReference()); aCtUnboundVariableReference.setType(spoon.support.visitor.equals.CloneHelper.clone(reference.getType())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtUnboundVariableReference; + this.other = aCtUnboundVariableReference; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtFieldRead(final spoon.reflect.code.CtFieldRead fieldRead) { - spoon.reflect.code.CtFieldRead aCtFieldRead = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, fieldRead, fieldRead.getFactory().Core().createFieldRead()); + spoon.reflect.code.CtFieldRead aCtFieldRead = spoon.support.visitor.clone.CloneBuilder.build(this.builder, fieldRead, fieldRead.getFactory().Core().createFieldRead()); aCtFieldRead.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(fieldRead.getAnnotations())); aCtFieldRead.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(fieldRead.getTypeCasts())); aCtFieldRead.setTarget(spoon.support.visitor.equals.CloneHelper.clone(fieldRead.getTarget())); aCtFieldRead.setVariable(spoon.support.visitor.equals.CloneHelper.clone(fieldRead.getVariable())); aCtFieldRead.setComments(spoon.support.visitor.equals.CloneHelper.clone(fieldRead.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtFieldRead; + this.other = aCtFieldRead; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtFieldWrite(final spoon.reflect.code.CtFieldWrite fieldWrite) { - spoon.reflect.code.CtFieldWrite aCtFieldWrite = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, fieldWrite, fieldWrite.getFactory().Core().createFieldWrite()); + spoon.reflect.code.CtFieldWrite aCtFieldWrite = spoon.support.visitor.clone.CloneBuilder.build(this.builder, fieldWrite, fieldWrite.getFactory().Core().createFieldWrite()); aCtFieldWrite.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(fieldWrite.getAnnotations())); aCtFieldWrite.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(fieldWrite.getTypeCasts())); aCtFieldWrite.setTarget(spoon.support.visitor.equals.CloneHelper.clone(fieldWrite.getTarget())); aCtFieldWrite.setVariable(spoon.support.visitor.equals.CloneHelper.clone(fieldWrite.getVariable())); aCtFieldWrite.setComments(spoon.support.visitor.equals.CloneHelper.clone(fieldWrite.getComments())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtFieldWrite; + this.other = aCtFieldWrite; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtSuperAccess(final spoon.reflect.code.CtSuperAccess f) { - spoon.reflect.code.CtSuperAccess aCtSuperAccess = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, f, f.getFactory().Core().createSuperAccess()); + spoon.reflect.code.CtSuperAccess aCtSuperAccess = spoon.support.visitor.clone.CloneBuilder.build(this.builder, f, f.getFactory().Core().createSuperAccess()); aCtSuperAccess.setType(spoon.support.visitor.equals.CloneHelper.clone(f.getType())); aCtSuperAccess.setComments(spoon.support.visitor.equals.CloneHelper.clone(f.getComments())); aCtSuperAccess.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(f.getAnnotations())); aCtSuperAccess.setTypeCasts(spoon.support.visitor.equals.CloneHelper.clone(f.getTypeCasts())); aCtSuperAccess.setTarget(spoon.support.visitor.equals.CloneHelper.clone(f.getTarget())); aCtSuperAccess.setVariable(spoon.support.visitor.equals.CloneHelper.clone(f.getVariable())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtSuperAccess; + this.other = aCtSuperAccess; } // auto-generated, see spoon.generating.CloneVisitorGenerator @java.lang.Override public void visitCtComment(final spoon.reflect.code.CtComment comment) { - spoon.reflect.code.CtComment aCtComment = spoon.support.visitor.clone.CloneBuilder.build(spoon.support.visitor.clone.CloneVisitor.this.builder, comment, comment.getFactory().Core().createComment()); + spoon.reflect.code.CtComment aCtComment = spoon.support.visitor.clone.CloneBuilder.build(this.builder, comment, comment.getFactory().Core().createComment()); aCtComment.setComments(spoon.support.visitor.equals.CloneHelper.clone(comment.getComments())); aCtComment.setAnnotations(spoon.support.visitor.equals.CloneHelper.clone(comment.getAnnotations())); - spoon.support.visitor.clone.CloneVisitor.this.other = aCtComment; + this.other = aCtComment; } } diff --git a/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java b/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java index 9a0453d26e0..7d9234b8f69 100644 --- a/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java +++ b/src/main/java/spoon/support/visitor/replace/ReplacementVisitor.java @@ -18,6 +18,7 @@ package spoon.support.visitor.replace; +import static spoon.support.visitor.replace.ReplacementVisitor.replace; /** * Used to replace an element by another one. @@ -37,8 +38,8 @@ public static void replace(spoon.reflect.declaration.CtElement original, spoon.r private spoon.reflect.declaration.CtElement replace; private ReplacementVisitor(spoon.reflect.declaration.CtElement original, spoon.reflect.declaration.CtElement replace) { - spoon.support.visitor.replace.ReplacementVisitor.this.original = original; - spoon.support.visitor.replace.ReplacementVisitor.this.replace = replace; + this.original = original; + this.replace = replace; } private void replaceInMapIfExist(java.util.Map mapProtected, spoon.generating.replace.ReplaceMapListener listener) { diff --git a/src/test/java/spoon/processing/CtGenerationTest.java b/src/test/java/spoon/processing/CtGenerationTest.java index fe45b1cfa1f..12c1ca0395a 100644 --- a/src/test/java/spoon/processing/CtGenerationTest.java +++ b/src/test/java/spoon/processing/CtGenerationTest.java @@ -9,6 +9,7 @@ import spoon.reflect.declaration.CtClass; import spoon.reflect.declaration.CtElement; import spoon.reflect.declaration.CtType; +import spoon.reflect.visitor.CtBiScannerDefault; import spoon.reflect.visitor.Filter; import spoon.reflect.visitor.PrettyPrinter; import spoon.support.visitor.replace.ReplacementVisitor; @@ -84,8 +85,8 @@ public void testGenerateCtBiScanner() throws Exception { // this can be done on an informed basis when important changes are made in the metamodel/scanner // and then we can have smaller clean tested pull requests to see the impact of the change // cp ./target/generated/spoon/reflect/visitor/CtBiScannerDefault.java ./src/main/java/spoon/reflect/visitor/CtBiScannerDefault.java - //assertThat(build(new File("./src/main/java/spoon/reflect/visitor/CtBiScannerDefault.java")).Class().get(CtBiScannerDefault.class)) - // .isEqualTo(build(new File("./target/generated/spoon/reflect/visitor/CtBiScannerDefault.java")).Class().get(CtBiScannerDefault.class)); + assertThat(build(new File("./src/main/java/spoon/reflect/visitor/CtBiScannerDefault.java")).Class().get(CtBiScannerDefault.class)) + .isEqualTo(build(new File("./target/generated/spoon/reflect/visitor/CtBiScannerDefault.java")).Class().get(CtBiScannerDefault.class)); } @Test