From aee23c3e1c08fbdc7e0303330b1e7c58dc32cf0f Mon Sep 17 00:00:00 2001
From: kstanger <kstanger@google.com>
Date: Tue, 11 Oct 2016 10:31:05 -0700
Subject: [PATCH] Use a VariableElement instead of IVariableBinding in
 EnumConstantDeclaration.

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

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135811727
---
 .../j2objc/ast/EnumConstantDeclaration.java       | 15 ++++++++++-----
 .../google/devtools/j2objc/jdt/TreeConverter.java |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/translator/src/main/java/com/google/devtools/j2objc/ast/EnumConstantDeclaration.java b/translator/src/main/java/com/google/devtools/j2objc/ast/EnumConstantDeclaration.java
index 995263116f..a3086cceb8 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/ast/EnumConstantDeclaration.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/ast/EnumConstantDeclaration.java
@@ -17,6 +17,7 @@
 import com.google.devtools.j2objc.jdt.BindingConverter;
 import java.util.List;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 
@@ -25,7 +26,7 @@
  */
 public class EnumConstantDeclaration extends BodyDeclaration {
 
-  private IVariableBinding variableBinding = null;
+  private VariableElement variableElement = null;
   private ExecutableElement method = null;
   private final ChildLink<SimpleName> name = ChildLink.create(SimpleName.class, this);
   private final ChildList<Expression> arguments = ChildList.create(Expression.class, this);
@@ -36,7 +37,7 @@ public EnumConstantDeclaration() {}
 
   public EnumConstantDeclaration(EnumConstantDeclaration other) {
     super(other);
-    variableBinding = other.getVariableBinding();
+    variableElement = other.getVariableElement();
     method = other.getExecutableElement();
     name.copyFrom(other.getName());
     arguments.copyFrom(other.getArguments());
@@ -49,11 +50,15 @@ public Kind getKind() {
   }
 
   public IVariableBinding getVariableBinding() {
-    return variableBinding;
+    return BindingConverter.unwrapVariableElement(variableElement);
   }
 
-  public EnumConstantDeclaration setVariableBinding(IVariableBinding binding) {
-    this.variableBinding = binding;
+  public VariableElement getVariableElement() {
+    return variableElement;
+  }
+
+  public EnumConstantDeclaration setVariableElement(VariableElement element) {
+    variableElement = element;
     return this;
   }
 
diff --git a/translator/src/main/java/com/google/devtools/j2objc/jdt/TreeConverter.java b/translator/src/main/java/com/google/devtools/j2objc/jdt/TreeConverter.java
index 9821643a64..37c4d8ddfa 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/jdt/TreeConverter.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/jdt/TreeConverter.java
@@ -604,7 +604,7 @@ private static TreeNode convertEnumConstantDeclaration(
     EnumConstantDeclaration newNode = new EnumConstantDeclaration();
     convertBodyDeclaration(node, newNode);
     newNode
-        .setVariableBinding(BindingConverter.wrapBinding(node.resolveVariable()))
+        .setVariableElement(BindingConverter.getVariableElement(node.resolveVariable()))
         .setExecutableElement(
             BindingConverter.getExecutableElement(node.resolveConstructorBinding()))
         .setName((SimpleName) convert(node.getName()))