squash: replace all

Author: astubbs

impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java

@@ -6,47 +6,24 @@
  */
 package org.jboss.forge.roaster.model.impl;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.*;
 import org.eclipse.jdt.core.dom.Modifier.ModifierKeyword;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.Statement;
-import org.eclipse.jdt.core.dom.TypeParameter;
-import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.jboss.forge.roaster.ParserException;
 import org.jboss.forge.roaster.Problem;
 import org.jboss.forge.roaster.Roaster;
 import org.jboss.forge.roaster.model.Annotation;
-import org.jboss.forge.roaster.model.JavaType;
 import org.jboss.forge.roaster.model.Type;
-import org.jboss.forge.roaster.model.TypeVariable;
-import org.jboss.forge.roaster.model.Visibility;
+import org.jboss.forge.roaster.model.*;
 import org.jboss.forge.roaster.model.ast.AnnotationAccessor;
 import org.jboss.forge.roaster.model.ast.ModifierAccessor;
-import org.jboss.forge.roaster.model.source.AnnotationSource;
-import org.jboss.forge.roaster.model.source.Import;
-import org.jboss.forge.roaster.model.source.JavaClassSource;
-import org.jboss.forge.roaster.model.source.JavaDocSource;
-import org.jboss.forge.roaster.model.source.JavaSource;
-import org.jboss.forge.roaster.model.source.MethodSource;
-import org.jboss.forge.roaster.model.source.ParameterSource;
-import org.jboss.forge.roaster.model.source.TypeVariableSource;
+import org.jboss.forge.roaster.model.source.*;
 import org.jboss.forge.roaster.model.util.Methods;
 import org.jboss.forge.roaster.model.util.Types;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
@@ -125,31 +102,34 @@ else if (Modifier.isPrivate(mod))
       }
    }
 
-   public MethodImpl(final O parent, final String method)
-   {
+   public MethodImpl(final O parent, final String method) {
       init(parent);
 
       String stub = "public class Stub { " + method + " }";
-      JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
-       List<Problem> problems = Roaster.validateSnippet(stub);
-       if (!problems.isEmpty()) {
-           throw new IllegalArgumentException("Invalid method code. " + problems.toString());
-       }
-       List<MethodSource<JavaClassSource>> methods = temp.getMethods();
-       if (methods.isEmpty())
-           throw new IllegalArgumentException("No methods found - check your method syntax");
-      MethodSource<JavaClassSource> javaClassSourceMethodSource = methods.get(0); // don't lookup indexes without validating them
+      List<MethodSource<JavaClassSource>> methods = getMethodSources(stub);
+      MethodSource<JavaClassSource> javaClassSourceMethodSource = methods.get(0);
       MethodDeclaration newMethod = (MethodDeclaration) javaClassSourceMethodSource.getInternal();
       this.method = (MethodDeclaration) ASTNode.copySubtree(cu.getAST(), newMethod);
    }
 
+   private List<MethodSource<JavaClassSource>> getMethodSources(final String stub) {
+      JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
+      List<Problem> problems = Roaster.validateSnippet(stub);
+      if (!problems.isEmpty()) {
+         throw new IllegalArgumentException("Invalid method code. " + problems.toString());
+      }
+      List<MethodSource<JavaClassSource>> methods = temp.getMethods();
+      if (methods.isEmpty())
+         throw new IllegalArgumentException("No methods found - check your method syntax");
+      return methods;
+   }
+
    @Override
-   public String toSignature()
-   {
+   public String toSignature() {
       StringBuilder signature = new StringBuilder();
       signature.append(Visibility.PACKAGE_PRIVATE == this.getVisibility() ? ""
-               : this.getVisibility()
-                        .scope());
+              : this.getVisibility()
+              .scope());
       signature.append(" ");
       signature.append(this.getName()).append("(");
       List<ParameterSource<O>> parameters = this.getParameters();
@@ -276,8 +256,7 @@ public MethodSource<O> setBody(final String body)
             throw new ParserException(problems);
          }
          String stub = "public class Stub { public void method() {" + body + "} }";
-         JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
-         List<MethodSource<JavaClassSource>> methods = temp.getMethods();
+         List<MethodSource<JavaClassSource>> methods = getMethodSources(stub);
          Block block = ((MethodDeclaration) methods.get(0).getInternal()).getBody();
          block = (Block) ASTNode.copySubtree(method.getAST(), block);
          method.setBody(block);
@@ -343,8 +322,7 @@ public MethodSource<O> setReturnType(final String typeName)
       String typeToUse = Types.toResolvedType(typeName, getOrigin());
 
       String stub = "public class Stub { public " + typeToUse + " method() {} }";
-      JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
-      List<MethodSource<JavaClassSource>> methods = temp.getMethods();
+      List<MethodSource<JavaClassSource>> methods = getMethodSources(stub);
       org.eclipse.jdt.core.dom.Type returnType = ((MethodDeclaration) methods.get(0).getInternal()).getReturnType2();
 
       returnType = (org.eclipse.jdt.core.dom.Type) ASTNode.copySubtree(method.getAST(), returnType);
@@ -501,8 +479,7 @@ public MethodSource<O> setName(final String name)
    public MethodSource<O> setParameters(final String parameters)
    {
       String stub = "public class Stub { public void method( " + parameters + " ) {} }";
-      JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
-      List<MethodSource<JavaClassSource>> methods = temp.getMethods();
+      List<MethodSource<JavaClassSource>> methods = getMethodSources(stub);
       List<VariableDeclaration> astParameters = ((MethodDeclaration) methods.get(0).getInternal()).parameters();
 
       method.parameters().clear();
@@ -841,8 +818,7 @@ public ParameterSource<O> addParameter(String type, String name)
       }
 
       String stub = "public class Stub { public void method( " + resolvedType + " " + name + " ) {} }";
-      JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
-      List<MethodSource<JavaClassSource>> methods = temp.getMethods();
+      List<MethodSource<JavaClassSource>> methods = getMethodSources(stub);
       List<VariableDeclaration> astParameters = ((MethodDeclaration) methods.get(0).getInternal()).parameters();
 
       ParameterSource<O> param = null;