Let FieldAccessExpr implement NodeWithSimpleName interface like MethodCallExpr etc

1 files changed, 35 insertions, 12 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
index ece230cbb..993184ca5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -23,6 +23,7 @@ package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName;
 import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.type.Type;
@@ -39,28 +40,28 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  *
  * @author Julio Vilmar Gesser
  */
-public final class FieldAccessExpr extends Expression implements NodeWithTypeArguments<FieldAccessExpr> {
+public final class FieldAccessExpr extends Expression implements NodeWithSimpleName<FieldAccessExpr>, NodeWithTypeArguments<FieldAccessExpr> {
 
     private Expression scope;
 
     private NodeList<Type> typeArguments;
 
-    private SimpleName field;
+    private SimpleName name;
 
     public FieldAccessExpr() {
         this(null, new ThisExpr(), new NodeList<>(), new SimpleName());
     }
 
-    public FieldAccessExpr(final Expression scope, final String field) {
-        this(null, scope, new NodeList<>(), new SimpleName(field));
+    public FieldAccessExpr(final Expression scope, final String name) {
+        this(null, scope, new NodeList<>(), new SimpleName(name));
     }
 
     public FieldAccessExpr(final Range range, final Expression scope, final NodeList<Type> typeArguments,
-                           final SimpleName field) {
+                           final SimpleName name) {
         super(range);
         setScope(scope);
         setTypeArguments(typeArguments);
-        setFieldExpr(field);
+        setName(name);
     }
 
     @Override
@@ -73,24 +74,46 @@ public final class FieldAccessExpr extends Expression implements NodeWithTypeArg
         v.visit(this, arg);
     }
 
+    @Override
+    public SimpleName getName() {
+        return name;
+    }
+
+    @Override
+    public FieldAccessExpr setName(SimpleName name) {
+        notifyPropertyChange(ObservableProperty.NAME, this.name, name);
+        this.name = assertNotNull(name);
+        setAsParentNodeOf(this.name);
+        return this;
+    }
+
+    /**
+     * Use {@link #getName} instead.
+     */
+    @Deprecated
     public SimpleName getField() {
-        return field;
+        return name;
     }
 
     public Optional<Expression> getScope() {
         return Optional.ofNullable(scope);
     }
 
+    /**
+     * Use {@link #setName} with new SimpleName(field) instead.
+     */
+    @Deprecated
     public FieldAccessExpr setField(final String field) {
-        setFieldExpr(new SimpleName(field));
+        setName(new SimpleName(field));
         return this;
     }
 
+    /**
+     * Use {@link #setName} instead.
+     */
+    @Deprecated
     public FieldAccessExpr setFieldExpr(SimpleName inner) {
-        notifyPropertyChange(ObservableProperty.FIELD, this.field, inner);
-        this.field = assertNotNull(inner);
-        setAsParentNodeOf(this.field);
-        return this;
+        return setName(inner);
     }
 
     /**