More or less done with naming

10 files changed, 106 insertions, 110 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
index f89604fa5..9a6a369a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -39,7 +39,7 @@ public final class AssertStmt extends Statement {
 
     private Expression check;
 
-    private Expression msg;
+    private Expression message;
 
     public AssertStmt() {
         this(null, new BooleanLiteralExpr(), null);
@@ -49,14 +49,14 @@ public final class AssertStmt extends Statement {
         this(null, check, null);
     }
 
-    public AssertStmt(final Expression check, final Expression msg) {
-        this(null, check, msg);
+    public AssertStmt(final Expression check, final Expression message) {
+        this(null, check, message);
     }
 
-    public AssertStmt(final Range range, final Expression check, final Expression msg) {
+    public AssertStmt(final Range range, final Expression check, final Expression message) {
         super(range);
         setCheck(check);
-        setMessage(msg);
+        setMessage(message);
     }
 
     @Override
@@ -74,7 +74,7 @@ public final class AssertStmt extends Statement {
     }
 
     public Optional<Expression> getMessage() {
-        return Optional.ofNullable(msg);
+        return Optional.ofNullable(message);
     }
 
     public AssertStmt setCheck(final Expression check) {
@@ -91,9 +91,9 @@ public final class AssertStmt extends Statement {
      * @return this, the AssertStmt
      */
     public AssertStmt setMessage(final Expression msg) {
-        notifyPropertyChange(ObservableProperty.MSG, this.msg, msg);
-        this.msg = msg;
-        setAsParentNodeOf(this.msg);
+        notifyPropertyChange(ObservableProperty.MESSAGE, this.message, msg);
+        this.message = msg;
+        setAsParentNodeOf(this.message);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
index d206d4eb0..45da38a5b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -35,20 +35,20 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class BlockStmt extends Statement implements NodeWithStatements<BlockStmt> {
 
-    private NodeList<Statement> stmts;
+    private NodeList<Statement> statements;
 
     public BlockStmt() {
         this(null, new NodeList<>());
     }
 
-    public BlockStmt(final NodeList<Statement> stmts) {
-        this(null, stmts);
+    public BlockStmt(final NodeList<Statement> statements) {
+        this(null, statements);
 
     }
 
-    public BlockStmt(final Range range, final NodeList<Statement> stmts) {
+    public BlockStmt(final Range range, final NodeList<Statement> statements) {
         super(range);
-        setStmts(stmts);
+        setStatements(statements);
     }
 
     @Override
@@ -61,16 +61,14 @@ public final class BlockStmt extends Statement implements NodeWithStatements<Blo
         v.visit(this, arg);
     }
 
-    @Override
-    public NodeList<Statement> getStmts() {
-        return stmts;
+    public NodeList<Statement> getStatements() {
+        return statements;
     }
 
-    @Override
-    public BlockStmt setStmts(final NodeList<Statement> stmts) {
-        notifyPropertyChange(ObservableProperty.STMTS, this.stmts, stmts);
-        this.stmts = assertNotNull(stmts);
-        setAsParentNodeOf(this.stmts);
+    public BlockStmt setStatements(final NodeList<Statement> statements) {
+        notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
+        this.statements = assertNotNull(statements);
+        setAsParentNodeOf(this.statements);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
index bc560792e..ca5e4fdc3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -35,7 +35,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class BreakStmt extends Statement {
 
-    private String id;
+    private String identifier;
 
     public BreakStmt() {
         this(null, "empty");
@@ -47,7 +47,7 @@ public final class BreakStmt extends Statement {
 
     public BreakStmt(final Range range, final String id) {
         super(range);
-        this.id = id;
+        this.identifier = id;
     }
 
     @Override
@@ -60,19 +60,19 @@ public final class BreakStmt extends Statement {
         v.visit(this, arg);
     }
 
-    public Optional<String> getId() {
-        return Optional.ofNullable(id);
+    public Optional<String> getIdentifier() {
+        return Optional.ofNullable(identifier);
     }
 
     /**
-     * Sets the id
+     * Sets the identifier
      * 
-     * @param id the id, can be null
+     * @param identifier the identifier, can be null
      * @return this, the BreakStmt
      */
-    public BreakStmt setId(final String id) {
-        notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    public BreakStmt setIdentifier(final String identifier) {
+        notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
index 83dbc112a..2ec9ee952 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
@@ -41,7 +41,7 @@ import java.util.EnumSet;
  */
 public final class CatchClause extends Node implements NodeWithBlockStmt<CatchClause> {
 
-    private Parameter param;
+    private Parameter parameter;
 
     private BlockStmt catchBlock;
 
@@ -49,8 +49,8 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
         this(null, new Parameter(), new BlockStmt());         
     }
 
-    public CatchClause(final Parameter param, final BlockStmt catchBlock) {
-        this(null, param, catchBlock);
+    public CatchClause(final Parameter parameter, final BlockStmt catchBlock) {
+        this(null, parameter, catchBlock);
     }
 
     public CatchClause(final EnumSet<Modifier> exceptModifier,
@@ -73,7 +73,7 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
                        final Parameter parameter,
                        final BlockStmt catchBlock) {
         super(range);
-        setParam(parameter);
+        setParameter(parameter);
         setBody(catchBlock);
     }
 
@@ -97,8 +97,8 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
 	 * Note that the type of the Parameter can be a UnionType. In this case, any annotations found at the start of the catch(@X A a |...)
 	 * are found directly in the Parameter. Annotations that are on the second or later type - catch(A a | @X B b ...) are found on those types.
 	 */
-	public Parameter getParam() {
-		return param;
+	public Parameter getParameter() {
+		return parameter;
 	}
 
     /**
@@ -109,10 +109,10 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
         return setBody(catchBlock);
 	}
 
-	public CatchClause setParam(final Parameter param) {
-        notifyPropertyChange(ObservableProperty.PARAM, this.param, param);
-		this.param = param;
-		setAsParentNodeOf(this.param);
+	public CatchClause setParameter(final Parameter parameter) {
+        notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
+		this.parameter = parameter;
+		setAsParentNodeOf(this.parameter);
         return this;
 	}
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
index 5dcb5869a..aad3208aa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -35,19 +35,19 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ContinueStmt extends Statement {
 
-	private String id;
+	private String identifier;
 
 	public ContinueStmt() {
         this(null, null);
 	}
 
-	public ContinueStmt(final String id) {
-		this(null, id);
+	public ContinueStmt(final String identifier) {
+		this(null, identifier);
 	}
 
-	public ContinueStmt(Range range, final String id) {
+	public ContinueStmt(Range range, final String identifier) {
 		super(range);
-		this.id = id;
+		this.identifier = identifier;
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -58,19 +58,19 @@ public final class ContinueStmt extends Statement {
 		v.visit(this, arg);
 	}
 
-    public Optional<String> getId() {
-        return Optional.ofNullable(id);
+    public Optional<String> getIdentifier() {
+        return Optional.ofNullable(identifier);
     }
 
     /**
-     * Sets the id
+     * Sets the identifier
      * 
-     * @param id the id, can be null
+     * @param identifier the identifier, can be null
      * @return this, the ContinueStmt
      */
-    public ContinueStmt setId(final String id) {
-	    notifyPropertyChange(ObservableProperty.ID, this.id, id);
-        this.id = assertNotNull(id);
+    public ContinueStmt setIdentifier(final String identifier) {
+	    notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
+        this.identifier = assertNotNull(identifier);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
index 4e6846037..68310a783 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
@@ -39,7 +39,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
 
-    private NodeList<Expression> init;
+    private NodeList<Expression> initialization;
 
     private Expression compare;
 
@@ -55,17 +55,17 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
                 new EmptyStmt());
     }
 
-    public ForStmt(final NodeList<Expression> init, final Expression compare,
+    public ForStmt(final NodeList<Expression> initialization, final Expression compare,
                    final NodeList<Expression> update, final Statement body) {
-        this(null, init, compare, update, body);
+        this(null, initialization, compare, update, body);
     }
 
     public ForStmt(Range range,
-                   final NodeList<Expression> init, final Expression compare,
+                   final NodeList<Expression> initialization, final Expression compare,
                    final NodeList<Expression> update, final Statement body) {
         super(range);
         setCompare(compare);
-        setInit(init);
+        setInitialization(initialization);
         setUpdate(update);
         setBody(body);
     }
@@ -89,8 +89,8 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
         return Optional.ofNullable(compare);
     }
 
-    public NodeList<Expression> getInit() {
-        return init;
+    public NodeList<Expression> getInitialization() {
+        return initialization;
     }
 
     public NodeList<Expression> getUpdate() {
@@ -118,10 +118,10 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
         return this;
     }
 
-    public ForStmt setInit(final NodeList<Expression> init) {
-        notifyPropertyChange(ObservableProperty.INIT, this.init, init);
-        this.init = assertNotNull(init);
-        setAsParentNodeOf(this.init);
+    public ForStmt setInitialization(final NodeList<Expression> initialization) {
+        notifyPropertyChange(ObservableProperty.INITIALIZER, this.initialization, initialization);
+        this.initialization = assertNotNull(initialization);
+        setAsParentNodeOf(this.initialization);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
index 24c237a62..3d4e015e2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
@@ -37,7 +37,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class ForeachStmt extends Statement implements NodeWithBody<ForeachStmt> {
 
-    private VariableDeclarationExpr var;
+    private VariableDeclarationExpr variable;
 
     private Expression iterable;
 
@@ -50,22 +50,22 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
                 new EmptyStmt());
     }
 
-    public ForeachStmt(final VariableDeclarationExpr var,
+    public ForeachStmt(final VariableDeclarationExpr variable,
                        final Expression iterable, final Statement body) {
-        this(null, var, iterable, body);
+        this(null, variable, iterable, body);
     }
 
     public ForeachStmt(Range range,
-                       final VariableDeclarationExpr var, final Expression iterable,
+                       final VariableDeclarationExpr variable, final Expression iterable,
                        final Statement body) {
         super(range);
-        setVariable(var);
+        setVariable(variable);
         setIterable(iterable);
         setBody(body);
     }
 
-    public ForeachStmt(VariableDeclarationExpr var, String iterable, BlockStmt body) {
-        this(null, var, new NameExpr(iterable), body);
+    public ForeachStmt(VariableDeclarationExpr variable, String iterable, BlockStmt body) {
+        this(null, variable, new NameExpr(iterable), body);
     }
 
     @Override
@@ -88,7 +88,7 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     }
 
     public VariableDeclarationExpr getVariable() {
-        return var;
+        return variable;
     }
 
     @Override
@@ -107,9 +107,9 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     }
 
     public ForeachStmt setVariable(final VariableDeclarationExpr var) {
-        notifyPropertyChange(ObservableProperty.VARIABLE, this.var, var);
-        this.var = assertNotNull(var);
-        setAsParentNodeOf(this.var);
+        notifyPropertyChange(ObservableProperty.VARIABLE, this.variable, var);
+        this.variable = assertNotNull(var);
+        setAsParentNodeOf(this.variable);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
index b7e886596..182735066 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -35,20 +35,20 @@ public final class LabeledStmt extends Statement {
 
 	private String label;
 
-	private Statement stmt;
+	private Statement statement;
 
 	public LabeledStmt() {
         this(null, "empty", new EmptyStmt());
 	}
 
-	public LabeledStmt(final String label, final Statement stmt) {
-        this(null, label, stmt);
+	public LabeledStmt(final String label, final Statement statement) {
+        this(null, label, statement);
 	}
 
-	public LabeledStmt(Range range, final String label, final Statement stmt) {
+	public LabeledStmt(Range range, final String label, final Statement statement) {
 		super(range);
 		setLabel(label);
-		setStmt(stmt);
+		setStatement(statement);
 	}
 
 	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -63,8 +63,8 @@ public final class LabeledStmt extends Statement {
 		return label;
 	}
 
-	public Statement getStmt() {
-		return stmt;
+	public Statement getStatement() {
+		return statement;
 	}
 
 	public LabeledStmt setLabel(final String label) {
@@ -73,10 +73,10 @@ public final class LabeledStmt extends Statement {
 		return this;
 	}
 
-	public LabeledStmt setStmt(final Statement stmt) {
-		notifyPropertyChange(ObservableProperty.STMT, this.stmt, stmt);
-		this.stmt = assertNotNull(stmt);
-		setAsParentNodeOf(this.stmt);
+	public LabeledStmt setStatement(final Statement statement) {
+		notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement);
+		this.statement = assertNotNull(statement);
+		setAsParentNodeOf(this.statement);
 		return this;
 	}
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index d4b29a546..c24182973 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
@@ -40,21 +40,21 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
 
 	private Expression label;
 
-	private NodeList<Statement> stmts;
+	private NodeList<Statement> statements;
 
 	public SwitchEntryStmt() {
 		this(null, null, new NodeList<>());
 	}
 
-	public SwitchEntryStmt(final Expression label, final NodeList<Statement> stmts) {
-		this(null, label, stmts);
+	public SwitchEntryStmt(final Expression label, final NodeList<Statement> statements) {
+		this(null, label, statements);
 	}
 
 	public SwitchEntryStmt(Range range, final Expression label,
-	                       final NodeList<Statement> stmts) {
+	                       final NodeList<Statement> statements) {
 		super(range);
 		setLabel(label);
-		setStmts(stmts);
+		setStatements(statements);
 	}
 
 	@Override
@@ -71,9 +71,8 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
         return Optional.ofNullable(label);
 	}
 
-	@Override
-    public NodeList<Statement> getStmts() {
-        return stmts;
+	public NodeList<Statement> getStatements() {
+        return statements;
 	}
 
     /**
@@ -89,11 +88,10 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
 		return this;
 	}
 
-	@Override
-    public SwitchEntryStmt setStmts(final NodeList<Statement> stmts) {
-		notifyPropertyChange(ObservableProperty.STMTS, this.stmts, stmts);
-		this.stmts = assertNotNull(stmts);
-		setAsParentNodeOf(this.stmts);
+	public SwitchEntryStmt setStatements(final NodeList<Statement> statements) {
+		notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
+		this.statements = assertNotNull(statements);
+		setAsParentNodeOf(this.statements);
         return this;
 	}
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
index 93314764b..83e8cc15a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
@@ -40,7 +40,7 @@ public final class TryStmt extends Statement {
     // TODO can be null
 	private BlockStmt tryBlock;
 
-	private NodeList<CatchClause> catchs;
+	private NodeList<CatchClause> catchClauses;
 
     // TODO can be null
 	private BlockStmt finallyBlock;
@@ -53,21 +53,21 @@ public final class TryStmt extends Statement {
 				null);
 	}
 
-	public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchs,
+	public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchClauses,
 			final BlockStmt finallyBlock) {
 		this(null,
 				new NodeList<>(),
 				tryBlock,
-				catchs,
+                catchClauses,
 				finallyBlock);
 	}
 
 	public TryStmt(Range range, NodeList<VariableDeclarationExpr> resources,
-	               final BlockStmt tryBlock, final NodeList<CatchClause> catchs, final BlockStmt finallyBlock) {
+                   final BlockStmt tryBlock, final NodeList<CatchClause> catchClauses, final BlockStmt finallyBlock) {
 		super(range);
 		setResources(resources);
 		setTryBlock(tryBlock);
-		setCatchs(catchs);
+		setCatchClauses(catchClauses);
 		setFinallyBlock(finallyBlock);
 	}
 
@@ -81,8 +81,8 @@ public final class TryStmt extends Statement {
 		v.visit(this, arg);
 	}
 
-	public NodeList<CatchClause> getCatchs() {
-        return catchs;
+	public NodeList<CatchClause> getCatchClauses() {
+        return catchClauses;
 	}
 
 	public BlockStmt getFinallyBlock() {
@@ -97,10 +97,10 @@ public final class TryStmt extends Statement {
         return resources;
 	}
 
-	public TryStmt setCatchs(final NodeList<CatchClause> catchs) {
-		notifyPropertyChange(ObservableProperty.CATCHS, this.catchs, catchs);
-		this.catchs = assertNotNull(catchs);
-		setAsParentNodeOf(this.catchs);
+	public TryStmt setCatchClauses(final NodeList<CatchClause> catchClauses) {
+		notifyPropertyChange(ObservableProperty.CATCH_CLAUSES, this.catchClauses, catchClauses);
+		this.catchClauses = assertNotNull(catchClauses);
+		setAsParentNodeOf(this.catchClauses);
 		return this;
 	}