Adds factory methods for GeneratedVariableElement so that the Element…

…Kind doesn't have to be specified as a parameter.

	Change on 2016/10/25 by kstanger <kstanger@google.com>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137146819

translator/src/main/java/com/google/devtools/j2objc/jdt/JdtTypeElement.java

@@ -100,9 +100,8 @@ public Element getEnclosingElement() {
       // This comes up when an anonymous class is initializing a member outside of a constructor.
       // The enclosing element should be the field it's being assigned to, but the binding doesn't
       // give us this information, so we have to fake it.
-      return new GeneratedVariableElement(
-          "fake_field", this.asType(), ElementKind.FIELD,
-          BindingConverter.getElement(decl.getDeclaringClass()));
+      return GeneratedVariableElement.newField(
+          "fake_field", this.asType(), BindingConverter.getElement(decl.getDeclaringClass()));
     } else {
       return BindingConverter.getElement(decl.getDeclaringClass());
     }

translator/src/main/java/com/google/devtools/j2objc/translate/AbstractMethodRewriter.java

@@ -179,8 +179,8 @@ private MethodDeclaration newReturnTypeNarrowingDeclaration(
     }
     int argCount = 0;
     for (TypeMirror paramType : method.type().getParameterTypes()) {
-      VariableElement param = new GeneratedVariableElement(
-          "arg" + argCount++, paramType, ElementKind.PARAMETER, element);
+      VariableElement param = GeneratedVariableElement.newParameter(
+          "arg" + argCount++, paramType, element);
       element.addParameter(param);
       decl.addParameter(new SingleVariableDeclaration(param));
     }

translator/src/main/java/com/google/devtools/j2objc/translate/AnonymousClassConverter.java

@@ -33,7 +33,6 @@
 import com.google.devtools.j2objc.types.GeneratedVariableElement;
 import com.google.devtools.j2objc.util.ElementUtil;
 import com.google.devtools.j2objc.util.TypeUtil;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
@@ -108,8 +107,8 @@ private void addDefaultConstructor(TypeDeclaration node, ExecutableElement const
     // constructor and passed to the super call.
     int argCount = 0;
     for (VariableElement param : constructorElement.getParameters()) {
-      GeneratedVariableElement newParam = new GeneratedVariableElement(
-          "arg$" + argCount++, param.asType(), ElementKind.PARAMETER, constructorElement);
+      GeneratedVariableElement newParam = GeneratedVariableElement.newParameter(
+          "arg$" + argCount++, param.asType(), constructorElement);
       constructor.addParameter(new SingleVariableDeclaration(newParam));
       superCall.addArgument(new SimpleName(newParam));
     }

translator/src/main/java/com/google/devtools/j2objc/translate/DefaultMethodShimGenerator.java

@@ -44,7 +44,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -182,7 +181,7 @@ private boolean takesPrecedence(ExecutablePair a, ExecutablePair b) {
 
     private void addShimWithInvocation(
         String selector, ExecutablePair method, Expression invocation, List<Expression> args) {
-      ExecutableElement element = GeneratedExecutableElement.newMethodWithSelector(
+      GeneratedExecutableElement element = GeneratedExecutableElement.newMethodWithSelector(
               selector, method.type().getReturnType(), typeElem)
           .addModifiers(method.element().getModifiers())
           .removeModifiers(Modifier.ABSTRACT, Modifier.DEFAULT);
@@ -192,8 +191,9 @@ private void addShimWithInvocation(
 
       int i = 0;
       for (TypeMirror paramType : method.type().getParameterTypes()) {
-        GeneratedVariableElement newParam = new GeneratedVariableElement(
-            "arg" + i++, paramType, ElementKind.PARAMETER, null);
+        GeneratedVariableElement newParam = GeneratedVariableElement.newParameter(
+            "arg" + i++, paramType, element);
+        element.addParameter(newParam);
         methodDecl.addParameter(new SingleVariableDeclaration(newParam));
         args.add(new SimpleName(newParam));
       }

translator/src/main/java/com/google/devtools/j2objc/translate/EnhancedForRewriter.java

@@ -41,7 +41,6 @@
 import com.google.j2objc.annotations.LoopTranslation.LoopStyle;
 import java.util.List;
 import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
@@ -91,19 +90,17 @@ private void handleArrayIteration(EnhancedForStatement node) {
     TypeMirror componentType = expressionType.getComponentType();
     TypeElement iosArrayType = typeEnv.resolveArrayType(componentType);
     TypeMirror bufferType = new PointerType(componentType);
-    VariableElement arrayVariable = new GeneratedVariableElement(
-        "a__", expressionType, ElementKind.LOCAL_VARIABLE, null);
-    VariableElement bufferVariable = new GeneratedVariableElement(
-        "b__", bufferType, ElementKind.LOCAL_VARIABLE, null)
+    VariableElement arrayVariable = GeneratedVariableElement.newLocalVar(
+        "a__", expressionType, null);
+    VariableElement bufferVariable = GeneratedVariableElement.newLocalVar("b__", bufferType, null)
         .setTypeQualifiers("const*");
-    VariableElement endVariable = new GeneratedVariableElement(
-        "e__", bufferType, ElementKind.LOCAL_VARIABLE, null)
+    VariableElement endVariable = GeneratedVariableElement.newLocalVar("e__", bufferType, null)
         .setTypeQualifiers("const*");
-    VariableElement bufferField = new GeneratedVariableElement(
-        "buffer", bufferType, ElementKind.FIELD, iosArrayType)
+    VariableElement bufferField = GeneratedVariableElement.newField(
+        "buffer", bufferType, iosArrayType)
         .addModifiers(Modifier.PUBLIC);
-    VariableElement sizeField = new GeneratedVariableElement(
-        "size", typeUtil.getPrimitiveType(TypeKind.INT), ElementKind.FIELD, iosArrayType)
+    VariableElement sizeField = GeneratedVariableElement.newField(
+        "size", typeUtil.getPrimitiveType(TypeKind.INT), iosArrayType)
         .addModifiers(Modifier.PUBLIC);
 
     VariableDeclarationStatement arrayDecl =
@@ -161,8 +158,8 @@ private void convertToJavaIteratorLoop(EnhancedForStatement node) {
     ExecutablePair nextMethod = typeUtil.findMethod(iteratorType, "next");
     assert hasNextMethod != null && nextMethod != null;
 
-    VariableElement iteratorVariable = new GeneratedVariableElement(
-        "iter__", iteratorType, ElementKind.LOCAL_VARIABLE, null);
+    VariableElement iteratorVariable = GeneratedVariableElement.newLocalVar(
+        "iter__", iteratorType, null);
 
     MethodInvocation iteratorInvocation =
         new MethodInvocation(iteratorMethod, TreeUtil.remove(expression));
@@ -204,8 +201,8 @@ private void boxLoopVariable(
     DeclaredType iterableType = typeUtil.findSupertype(expressionType, "java.lang.Iterable");
     List<? extends TypeMirror> typeArgs = iterableType.getTypeArguments();
     assert typeArgs.size() == 1 && typeUtil.isBoxedType(typeArgs.get(0));
-    VariableElement boxVariable = new GeneratedVariableElement(
-        "boxed__", typeArgs.get(0), ElementKind.LOCAL_VARIABLE, null);
+    VariableElement boxVariable = GeneratedVariableElement.newLocalVar(
+        "boxed__", typeArgs.get(0), null);
     node.setParameter(new SingleVariableDeclaration(boxVariable));
     makeBlock(node.getBody()).addStatement(
         0, new VariableDeclarationStatement(loopVariable, new SimpleName(boxVariable)));

translator/src/main/java/com/google/devtools/j2objc/translate/EnumRewriter.java

@@ -58,7 +58,6 @@
 import com.google.j2objc.annotations.ObjectiveCName;
 import java.util.ArrayList;
 import java.util.List;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
@@ -153,8 +152,7 @@ private void addSimpleNonArcInitialization(EnumDeclaration node) {
 
     TypeMirror intType = typeEnv.resolveJavaTypeMirror("int");
     GeneratedVariableElement loopCounterElement =
-        new GeneratedVariableElement("i", intType,
-            ElementKind.LOCAL_VARIABLE, TreeUtil.getEnclosingElement(node));
+        GeneratedVariableElement.newLocalVar("i", intType, TreeUtil.getEnclosingElement(node));
     VariableDeclarationExpression loopCounter =
         new VariableDeclarationExpression().setType(Type.newType(loopCounterElement.asType()))
             .addFragment(new VariableDeclarationFragment(

translator/src/main/java/com/google/devtools/j2objc/translate/LambdaRewriter.java

@@ -151,8 +151,8 @@ private void replaceNode() {
         node.replaceWith(creation);
       } else {
         // For non-capturing lambdas, create a static final instance.
-        VariableElement instanceVar = new GeneratedVariableElement(
-            "instance", lambdaType.asType(), ElementKind.FIELD, lambdaType)
+        VariableElement instanceVar = GeneratedVariableElement.newField(
+            "instance", lambdaType.asType(), lambdaType)
             .addModifiers(Modifier.STATIC, Modifier.FINAL);
         typeDecl.addBodyDeclaration(new FieldDeclaration(instanceVar, creation));
         node.replaceWith(new SimpleName(instanceVar));
@@ -188,8 +188,8 @@ private Iterator<VariableElement> createParameters() {
       List<VariableElement> params = new ArrayList<>(paramTypes.size());
       int i = 0;
       for (TypeMirror type : paramTypes) {
-        GeneratedVariableElement param = new GeneratedVariableElement(
-            getParamName(i++), type, ElementKind.PARAMETER, null);
+        GeneratedVariableElement param = GeneratedVariableElement.newParameter(
+            getParamName(i++), type, implElement);
         params.add(param);
         implElement.addParameter(param);
         implDecl.addParameter(new SingleVariableDeclaration(param));

translator/src/main/java/com/google/devtools/j2objc/types/GeneratedExecutableElement.java

@@ -114,8 +114,7 @@ public void addParametersPlaceholderFront(List<TypeMirror> types) {
   }
 
   public void addParameterPlaceholderFront(TypeMirror type) {
-    parameters.add(0, new GeneratedVariableElement(
-        "placeholder", type, ElementKind.PARAMETER, null));
+    parameters.add(0, GeneratedVariableElement.newParameter("placeholder", type, this));
   }
 
   @Override

translator/src/main/java/com/google/devtools/j2objc/types/GeneratedVariableElement.java

@@ -43,17 +43,28 @@ public static GeneratedVariableElement asMutable(VariableElement var) {
             var.getKind(), var.getEnclosingElement(), ElementUtil.isSynthetic(var));
   }
 
-  public GeneratedVariableElement(
-      String name, TypeMirror type, ElementKind kind, Element enclosingElement) {
-    this(name, type, kind, enclosingElement, true);
-  }
-
   private GeneratedVariableElement(
       String name, TypeMirror type, ElementKind kind, Element enclosingElement, boolean synthetic) {
     super(Preconditions.checkNotNull(name), checkElementKind(kind), enclosingElement, synthetic);
     this.type = type;
   }
 
+  public static GeneratedVariableElement newField(
+      String name, TypeMirror type, Element enclosingElement) {
+    return new GeneratedVariableElement(name, type, ElementKind.FIELD, enclosingElement, true);
+  }
+
+  public static GeneratedVariableElement newParameter(
+      String name, TypeMirror type, Element enclosingElement) {
+    return new GeneratedVariableElement(name, type, ElementKind.PARAMETER, enclosingElement, true);
+  }
+
+  public static GeneratedVariableElement newLocalVar(
+      String name, TypeMirror type, Element enclosingElement) {
+    return new GeneratedVariableElement(
+        name, type, ElementKind.LOCAL_VARIABLE, enclosingElement, true);
+  }
+
   private static ElementKind checkElementKind(ElementKind kind) {
     Preconditions.checkArgument(
         kind == ElementKind.FIELD || kind == ElementKind.LOCAL_VARIABLE

translator/src/main/java/com/google/devtools/j2objc/util/CaptureInfo.java

@@ -22,7 +22,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
@@ -150,8 +149,7 @@ private String getCaptureFieldName(VariableElement var, TypeElement type) {
   public VariableElement getOrCreateOuterParam(TypeElement type) {
     VariableElement outerParam = outerParams.get(type);
     if (outerParam == null) {
-      outerParam = new GeneratedVariableElement(
-          "outer$", getDeclaringType(type), ElementKind.PARAMETER, type)
+      outerParam = GeneratedVariableElement.newParameter("outer$", getDeclaringType(type), type)
           .setNonnull(true);
       outerParams.put(type, outerParam);
     }
@@ -163,8 +161,8 @@ public VariableElement getOrCreateOuterField(TypeElement type) {
     getOrCreateOuterParam(type);
     VariableElement outerField = outerFields.get(type);
     if (outerField == null) {
-      outerField = new GeneratedVariableElement(
-          getOuterFieldName(type), getDeclaringType(type), ElementKind.FIELD, type)
+      outerField = GeneratedVariableElement.newField(
+          getOuterFieldName(type), getDeclaringType(type), type)
           .addModifiers(Modifier.PRIVATE, Modifier.FINAL)
           .setNonnull(true);
       outerFields.put(type, outerField);
@@ -179,8 +177,8 @@ private LocalCapture getOrCreateLocalCapture(VariableElement var, TypeElement de
         return localCapture;
       }
     }
-    LocalCapture newCapture = new LocalCapture(var, new GeneratedVariableElement(
-        "capture$" + capturesForType.size(), var.asType(), ElementKind.PARAMETER, declaringType));
+    LocalCapture newCapture = new LocalCapture(var, GeneratedVariableElement.newParameter(
+        "capture$" + capturesForType.size(), var.asType(), declaringType));
     capturesForType.add(newCapture);
     return newCapture;
   }
@@ -192,8 +190,8 @@ public VariableElement getOrCreateCaptureParam(VariableElement var, TypeElement
   public VariableElement getOrCreateCaptureField(VariableElement var, TypeElement declaringType) {
     LocalCapture capture = getOrCreateLocalCapture(var, declaringType);
     if (capture.field == null) {
-      capture.field = new GeneratedVariableElement(
-          getCaptureFieldName(var, declaringType), var.asType(), ElementKind.FIELD, declaringType)
+      capture.field = GeneratedVariableElement.newField(
+          getCaptureFieldName(var, declaringType), var.asType(), declaringType)
           .addModifiers(Modifier.PRIVATE, Modifier.FINAL)
           .addAnnotationMirrors(var.getAnnotationMirrors());
     }
@@ -202,8 +200,8 @@ public VariableElement getOrCreateCaptureField(VariableElement var, TypeElement
 
   public VariableElement createSuperOuterParam(TypeElement type, TypeMirror superOuterType) {
     assert !superOuterParams.containsKey(type);
-    VariableElement param = new GeneratedVariableElement(
-        "superOuter$", superOuterType, ElementKind.PARAMETER, type)
+    VariableElement param = GeneratedVariableElement.newParameter(
+        "superOuter$", superOuterType, type)
         .setNonnull(true);
     superOuterParams.put(type, param);
     return param;
@@ -212,11 +210,9 @@ public VariableElement createSuperOuterParam(TypeElement type, TypeMirror superO
   public void addMethodReferenceReceiver(TypeElement type, TypeMirror receiverType) {
     assert !outerParams.containsKey(type) && !outerFields.containsKey(type);
     // Add the target field as an outer field even though it's not really pointing to outer scope.
-    outerParams.put(type, new GeneratedVariableElement(
-        "outer$", receiverType, ElementKind.PARAMETER, type)
+    outerParams.put(type, GeneratedVariableElement.newParameter("outer$", receiverType, type)
         .setNonnull(true));
-    outerFields.put(type, new GeneratedVariableElement(
-        "target$", receiverType, ElementKind.FIELD, type)
+    outerFields.put(type, GeneratedVariableElement.newField("target$", receiverType, type)
         .addModifiers(Modifier.PRIVATE, Modifier.FINAL)
         .setNonnull(true));
   }