Changing naming...

15 files changed, 91 insertions, 68 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
index 88256a097..eb2c82550 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
@@ -50,21 +50,21 @@ public final class AssignExpr extends Expression {
 
     private Expression value;
 
-    private Operator op;
+    private Operator operator;
 
     public AssignExpr() {
         this(null, new NameExpr(), new StringLiteralExpr(), Operator.assign);
     }
 
-    public AssignExpr(Expression target, Expression value, Operator op) {
-        this(null, target, value, op);
+    public AssignExpr(Expression target, Expression value, Operator operator) {
+        this(null, target, value, operator);
     }
 
-    public AssignExpr(Range range, Expression target, Expression value, Operator op) {
+    public AssignExpr(Range range, Expression target, Expression value, Operator operator) {
         super(range);
         setTarget(target);
         setValue(value);
-        setOperator(op);
+        setOperator(operator);
     }
 
     @Override
@@ -78,7 +78,7 @@ public final class AssignExpr extends Expression {
     }
 
     public Operator getOperator() {
-        return op;
+        return operator;
     }
 
     public Expression getTarget() {
@@ -90,7 +90,7 @@ public final class AssignExpr extends Expression {
     }
 
     public AssignExpr setOperator(Operator op) {
-        this.op = op;
+        this.operator = op;
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
index 85cd7f7ef..fa37bc949 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
@@ -57,21 +57,21 @@ public final class BinaryExpr extends Expression {
 
     private Expression right;
 
-    private Operator op;
+    private Operator operator;
 
     public BinaryExpr() {
         this(null, new BooleanLiteralExpr(), new BooleanLiteralExpr(), Operator.equals);
     }
 
-    public BinaryExpr(Expression left, Expression right, Operator op) {
-        this(null, left, right, op);
+    public BinaryExpr(Expression left, Expression right, Operator operator) {
+        this(null, left, right, operator);
     }
 
-    public BinaryExpr(Range range, Expression left, Expression right, Operator op) {
+    public BinaryExpr(Range range, Expression left, Expression right, Operator operator) {
         super(range);
     	setLeft(left);
     	setRight(right);
-    	setOperator(op);
+    	setOperator(operator);
     }
 
     @Override
@@ -89,7 +89,7 @@ public final class BinaryExpr extends Expression {
     }
 
     public Operator getOperator() {
-        return op;
+        return operator;
     }
 
     public Expression getRight() {
@@ -104,8 +104,8 @@ public final class BinaryExpr extends Expression {
     }
 
     public BinaryExpr setOperator(Operator op) {
-        notifyPropertyChange(ObservableProperty.OPERATOR, this.op, op);
-        this.op = op;
+        notifyPropertyChange(ObservableProperty.OPERATOR, this.operator, op);
+        this.operator = op;
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index 472faf8e3..07d8bc233 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.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.NodeWithIdentifier;
 import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
 import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.type.Type;
@@ -41,7 +42,9 @@ import java.util.Optional;
  * @author Raquel Pau
  *
  */
-public class MethodReferenceExpr extends Expression implements NodeWithTypeArguments<MethodReferenceExpr> {
+public class MethodReferenceExpr extends Expression implements
+        NodeWithTypeArguments<MethodReferenceExpr>,
+        NodeWithIdentifier<MethodReferenceExpr> {
 
     private Expression scope;
 
@@ -105,14 +108,15 @@ public class MethodReferenceExpr extends Expression implements NodeWithTypeArgum
         return this;
     }
 
+    @Override
     public String getIdentifier() {
         return identifier;
     }
 
+    @Override
     public MethodReferenceExpr setIdentifier(String identifier) {
         notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
         this.identifier = identifier;
         return this;
     }
-
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
index 26b948462..4c7179c13 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
@@ -23,6 +23,7 @@ package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.nodeTypes.NodeWithIdentifier;
 import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
@@ -33,16 +34,16 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  * A name that may consist of multiple identifiers.
  * In other words: it.may.contain.dots.
  * <p>
- * The rightmost identifier is "id",
- * The one to the left of it is "qualifier.id", etc.
+ * The rightmost identifier is "identifier",
+ * The one to the left of it is "qualifier.identifier", etc.
  * <p>
  * You can construct one from a String with the name(...) method.
  *
  * @see SimpleName
  * @author Julio Vilmar Gesser
  */
-public class Name extends Node {
-    private String id;
+public class Name extends Node implements NodeWithIdentifier<Name> {
+    private String identifier;
     // TODO nullable
     private Name qualifier;
 
@@ -50,17 +51,17 @@ public class Name extends Node {
         this(null, null, "empty");
     }
 
-    public Name(final String id) {
-        this(null, null, id);
+    public Name(final String identifier) {
+        this(null, null, identifier);
     }
 
-    public Name(Name qualifier, final String id) {
-        this(null, qualifier, id);
+    public Name(Name qualifier, final String identifier) {
+        this(null, qualifier, identifier);
     }
 
-    public Name(Range range, Name qualifier, final String id) {
+    public Name(Range range, Name qualifier, final String identifier) {
         super(range);
-        setId(id);
+        setIdentifier(identifier);
         setQualifier(qualifier);
     }
 
@@ -74,13 +75,13 @@ public class Name extends Node {
         v.visit(this, arg);
     }
 
-    public final String getId() {
-        return id;
+    public final String getIdentifier() {
+        return identifier;
     }
 
-    public Name setId(final String id) {
-        notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    public Name setIdentifier(final String identifier) {
+        notifyPropertyChange(ObservableProperty.ID, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 
@@ -105,9 +106,9 @@ public class Name extends Node {
      */
     public String asString() {
         if (qualifier != null) {
-            return qualifier.asString() + "." + id;
+            return qualifier.asString() + "." + identifier;
         }
-        return id;
+        return identifier;
     }
 
     public Name getQualifier() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
index dcc1fc2ce..8d91fe482 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
@@ -2,6 +2,7 @@ package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.nodeTypes.NodeWithIdentifier;
 import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
@@ -13,20 +14,20 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  * In other words: it.does.NOT.contain.dots.
  * @see Name
  */
-public class SimpleName extends Node {
-    private String id;
+public class SimpleName extends Node implements NodeWithIdentifier<SimpleName> {
+    private String identifier;
 
     public SimpleName() {
         this(null, "empty");
     }
 
-    public SimpleName(final String id) {
-        this(null, id);
+    public SimpleName(final String identifier) {
+        this(null, identifier);
     }
 
-    public SimpleName(Range range, final String id) {
+    public SimpleName(Range range, final String identifier) {
         super(range);
-        setId(id);
+        setIdentifier(identifier);
     }
 
     @Override
@@ -39,13 +40,15 @@ public class SimpleName extends Node {
         v.visit(this, arg);
     }
 
-    public final String getId() {
-        return id;
+    @Override
+    public final String getIdentifier() {
+        return identifier;
     }
 
-    public SimpleName setId(final String id) {
-        notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    @Override
+    public SimpleName setIdentifier(final String identifier) {
+        notifyPropertyChange(ObservableProperty.ID, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
index 829f2c5e4..ab957078c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
@@ -46,20 +46,20 @@ public final class UnaryExpr extends Expression implements
 
 	private Expression expression;
 
-	private Operator op;
+	private Operator operator;
 
 	public UnaryExpr() {
         this(null, new IntegerLiteralExpr(), Operator.postIncrement);
 	}
 
-	public UnaryExpr(final Expression expression, final Operator op) {
-        this(null, expression, op);
+	public UnaryExpr(final Expression expression, final Operator operator) {
+        this(null, expression, operator);
 	}
 
-	public UnaryExpr(final Range range, final Expression expression, final Operator op) {
+	public UnaryExpr(final Range range, final Expression expression, final Operator operator) {
 		super(range);
 		setExpression(expression);
-		setOperator(op);
+		setOperator(operator);
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -76,7 +76,7 @@ public final class UnaryExpr extends Expression implements
 	}
 
 	public Operator getOperator() {
-		return op;
+		return operator;
 	}
 
     @Override
@@ -88,8 +88,8 @@ public final class UnaryExpr extends Expression implements
 	}
 
 	public UnaryExpr setOperator(final Operator op) {
-		notifyPropertyChange(ObservableProperty.OPERATOR, this.op, op);
-		this.op = op;
+		notifyPropertyChange(ObservableProperty.OPERATOR, this.operator, op);
+		this.operator = op;
 		return this;
 	}
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
index 6f42dd48d..e49d580c7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
@@ -131,7 +131,7 @@ public interface NodeWithAnnotations<N extends Node> {
      * @return true if found, false if not
      */
     default boolean isAnnotationPresent(String annotationName) {
-        return getAnnotations().stream().anyMatch(a -> a.getName().getId().equals(annotationName));
+        return getAnnotations().stream().anyMatch(a -> a.getName().getIdentifier().equals(annotationName));
     }
 
     /**
@@ -151,7 +151,7 @@ public interface NodeWithAnnotations<N extends Node> {
      * @return null if not found, the annotation otherwise
      */
     default AnnotationExpr getAnnotationByName(String annotationName) {
-        return getAnnotations().stream().filter(a -> a.getName().getId().equals(annotationName)).findFirst()
+        return getAnnotations().stream().filter(a -> a.getName().getIdentifier().equals(annotationName)).findFirst()
                 .orElse(null);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
new file mode 100644
index 000000000..5f096ed2a
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
@@ -0,0 +1,17 @@
+package com.github.javaparser.ast.nodeTypes;
+
+import com.github.javaparser.ast.Node;
+
+public interface NodeWithIdentifier<N extends Node> {
+    String getIdentifier();
+    
+    N setIdentifier(String identifier);
+
+    default String getId() {
+        return getIdentifier();
+    }
+
+    default N setId(String id) {
+        return setIdentifier(id);
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
index be1ac96ad..ceca89a3d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
@@ -41,6 +41,6 @@ public interface NodeWithSimpleName<N extends Node> {
     }
 
     default String getNameAsString(){
-        return getName().getId();
+        return getName().getIdentifier();
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
index 4f4956d76..e26536d9f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -845,7 +845,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 		Name r = new Name(
 				_n.getRange().orElse(null),
 				scope,
-                _n.getId()
+                _n.getIdentifier()
 		);
 		r.setComment(comment);
 		return r;
@@ -853,7 +853,7 @@ public class CloneVisitor implements GenericVisitor<Visitable, Object> {
 
     @Override
     public Visitable visit(SimpleName n, Object arg) {
-        return new SimpleName(n.getId());
+        return new SimpleName(n.getIdentifier());
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
index 273c226bc..1a9c09eb7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -1091,7 +1091,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
 			return false;
 		}
 
-		if (!objEquals(n1.getId(), n2.getId())) {
+		if (!objEquals(n1.getIdentifier(), n2.getIdentifier())) {
 			return false;
 		}
 
@@ -1102,7 +1102,7 @@ public class EqualsVisitor implements GenericVisitor<Boolean, Visitable> {
     public Boolean visit(SimpleName n, Visitable arg) {
         final SimpleName n2 = (SimpleName) arg;
 
-        return objEquals(n.getId(), n2.getId());
+        return objEquals(n.getIdentifier(), n2.getIdentifier());
     }
 
     @Override public Boolean visit(final ThisExpr n1, final Visitable arg) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
index e21715033..bf541aa87 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -292,14 +292,14 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
             n.getQualifier().accept(this, arg);
             printer.print(".");
         }
-        printer.print(n.getId());
+        printer.print(n.getIdentifier());
 
         printOrphanCommentsEnding(n);
     }
 
     @Override
     public void visit(SimpleName n, Void arg) {
-        printer.print(n.getId());
+        printer.print(n.getIdentifier());
     }
 
     @Override
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
index c36404599..7988e3072 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java
@@ -155,7 +155,7 @@ public class NodeListTest {
         cd.getMembers().replaceAll(bodyDeclaration -> {
             FieldDeclaration clone = (FieldDeclaration)bodyDeclaration.clone();
             VariableDeclaratorId id = clone.getVariable(0).getIdentifier();
-            id.setName(id.getName().getId().toUpperCase());
+            id.setName(id.getName().getIdentifier().toUpperCase());
             return clone;
         });
         assertEquals(Arrays.asList("'int a;' REMOVAL in list at 0", "'int A;' ADDITION in list at 0",
@@ -171,7 +171,7 @@ public class NodeListTest {
         ClassOrInterfaceDeclaration cd = cu.getClassByName("A");
         cd.getMembers().register(createObserver(changes));
 
-        cd.getMembers().removeIf(m -> ((FieldDeclaration)m).getVariable(0).getIdentifier().getName().getId().length() > 3);
+        cd.getMembers().removeIf(m -> ((FieldDeclaration)m).getVariable(0).getIdentifier().getName().getIdentifier().length() > 3);
         assertEquals(Arrays.asList("'int longName;' REMOVAL in list at 1"), changes);
     }
 }
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/NameTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/NameTest.java
index a659088dc..b24c180ae 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/NameTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/NameTest.java
@@ -8,7 +8,7 @@ public class NameTest {
     @Test
     public void outerNameExprIsTheRightMostIdentifier() {
         Name name = Name.parse("a.b.c");
-        assertEquals("c", name.getId());
+        assertEquals("c", name.getIdentifier());
     }
 
     @Test
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
index e31d9cf35..fd4e2ed0e 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
@@ -5,8 +5,6 @@ import static org.junit.Assert.assertEquals;
 import com.github.javaparser.JavaParser;
 import org.junit.Test;
 
-import com.github.javaparser.ast.expr.Name;
-
 public class ImportDeclarationTest {
     @Test
     public void singleTypeImportDeclaration() {
@@ -20,7 +18,7 @@ public class ImportDeclarationTest {
         ImportDeclaration importDeclaration = JavaParser.parseImport("import a.b.c.D.*;");
         TypeImportOnDemandDeclaration i = (TypeImportOnDemandDeclaration) importDeclaration;
         assertEquals("a.b.c.D", i.getName().toString());
-        assertEquals("D", i.getName().getId());
+        assertEquals("D", i.getName().getIdentifier());
     }
 
     @Test