Reformat all source in Intellij Idea

32 files changed, 463 insertions, 423 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
index 2e45244a2..0c6aaff3b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
@@ -41,7 +41,7 @@ public abstract class AnnotationExpr extends Expression implements NodeWithName<
     public AnnotationExpr(Name name) {
         this(null, name);
     }
-    
+
     public AnnotationExpr(Range range, Name name) {
         super(range);
         setName(name);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index 2612e96fe..afb82f7f2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -72,14 +72,14 @@ public final class ArrayAccessExpr extends Expression {
     public ArrayAccessExpr setIndex(Expression index) {
         notifyPropertyChange(ObservableProperty.INDEX, this.index, index);
         this.index = assertNotNull(index);
-		setAsParentNodeOf(this.index);
+        setAsParentNodeOf(this.index);
         return this;
     }
 
     public ArrayAccessExpr setName(Expression name) {
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
         this.name = assertNotNull(name);
-		setAsParentNodeOf(this.name);
+        setAsParentNodeOf(this.name);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 9271f98d0..fb16f7816 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -38,7 +38,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
  * <code>new int[5][4][][]</code> or <code>new int[][]{{1},{2,3}}</code>
- * 
+ *
  * @author Julio Vilmar Gesser
  */
 // NOTE does not implement NodeWithType because setType is problematic
@@ -100,7 +100,9 @@ public final class ArrayCreationExpr extends Expression {
         return Optional.ofNullable(initializer);
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     public Type<?> getElementType() {
         return elementType;
@@ -108,23 +110,25 @@ public final class ArrayCreationExpr extends Expression {
 
     /**
      * Sets the initializer
-     * 
+     *
      * @param initializer the initializer, can be null
      * @return this, the ArrayCreationExpr
      */
     public ArrayCreationExpr setInitializer(ArrayInitializerExpr initializer) {
         notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer);
         this.initializer = initializer;
-		setAsParentNodeOf(this.initializer);
+        setAsParentNodeOf(this.initializer);
         return this;
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     public ArrayCreationExpr setElementType(Type<?> elementType) {
         notifyPropertyChange(ObservableProperty.ELEMENT_TYPE, this.elementType, elementType);
         this.elementType = assertNotNull(elementType);
-		setAsParentNodeOf(this.elementType);
+        setAsParentNodeOf(this.elementType);
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 78c03e807..dfa942235 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -41,7 +41,7 @@ public final class ArrayInitializerExpr extends Expression {
     }
 
     public ArrayInitializerExpr(NodeList<Expression> values) {
-       this(null, values);
+        this(null, values);
     }
 
     public ArrayInitializerExpr(Range range, NodeList<Expression> values) {
@@ -66,7 +66,7 @@ public final class ArrayInitializerExpr extends Expression {
     public ArrayInitializerExpr setValues(NodeList<Expression> values) {
         notifyPropertyChange(ObservableProperty.VALUES, this.values, values);
         this.values = assertNotNull(values);
-		setAsParentNodeOf(this.values);
+        setAsParentNodeOf(this.values);
         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 057fdfd1c..e761422e6 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
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -57,7 +57,7 @@ public final class BinaryExpr extends Expression {
         Operator(String codeRepresentation) {
             this.codeRepresentation = codeRepresentation;
         }
-        
+
         public String asString() {
             return codeRepresentation;
         }
@@ -79,9 +79,9 @@ public final class BinaryExpr extends Expression {
 
     public BinaryExpr(Range range, Expression left, Expression right, Operator operator) {
         super(range);
-    	setLeft(left);
-    	setRight(right);
-    	setOperator(operator);
+        setLeft(left);
+        setRight(right);
+        setOperator(operator);
     }
 
     @Override
@@ -109,7 +109,7 @@ public final class BinaryExpr extends Expression {
     public BinaryExpr setLeft(Expression left) {
         notifyPropertyChange(ObservableProperty.LEFT, this.left, left);
         this.left = left;
-		setAsParentNodeOf(this.left);
+        setAsParentNodeOf(this.left);
         return this;
     }
 
@@ -122,7 +122,7 @@ public final class BinaryExpr extends Expression {
     public BinaryExpr setRight(Expression right) {
         notifyPropertyChange(ObservableProperty.RIGHT, this.right, right);
         this.right = right;
-		setAsParentNodeOf(this.right);
+        setAsParentNodeOf(this.right);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index 1d3d6fcc5..a0814b908 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -38,7 +38,7 @@ public final class BooleanLiteralExpr extends LiteralExpr {
     }
 
     public BooleanLiteralExpr(boolean value) {
-    	this(null, value);
+        this(null, value);
     }
 
     public BooleanLiteralExpr(Range range, boolean value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
index af2a9f4d0..ad8d60187 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
@@ -18,13 +18,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
-import com.github.javaparser.utils.Utils;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.utils.Utils;
 
 /**
  * @author Julio Vilmar Gesser
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
index 37b29ba52..440352663 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -33,8 +33,9 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  * Defines an expression that accesses the class of a type.
  * Example:
  * <code>
- *     Object.class
+ * Object.class
  * </code>
+ *
  * @author Julio Vilmar Gesser
  */
 public final class ClassExpr extends Expression implements NodeWithType<ClassExpr, Type<?>> {
@@ -46,7 +47,7 @@ public final class ClassExpr extends Expression implements NodeWithType<ClassExp
     }
 
     public ClassExpr(Type<?> type) {
-       this(null, type);
+        this(null, type);
     }
 
     public ClassExpr(Range range, Type type) {
@@ -73,7 +74,7 @@ public final class ClassExpr extends Expression implements NodeWithType<ClassExp
     public ClassExpr setType(Type<?> type) {
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
         this.type = type;
-		setAsParentNodeOf(this.type);
+        setAsParentNodeOf(this.type);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
index caa711534..c0006b3d3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -79,21 +79,21 @@ public final class ConditionalExpr extends Expression {
     public ConditionalExpr setCondition(Expression condition) {
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
         this.condition = assertNotNull(condition);
-		setAsParentNodeOf(this.condition);
+        setAsParentNodeOf(this.condition);
         return this;
     }
 
     public ConditionalExpr setElseExpr(Expression elseExpr) {
         notifyPropertyChange(ObservableProperty.ELSE_EXPR, this.elseExpr, elseExpr);
         this.elseExpr = assertNotNull(elseExpr);
-		setAsParentNodeOf(this.elseExpr);
+        setAsParentNodeOf(this.elseExpr);
         return this;
     }
 
     public ConditionalExpr setThenExpr(Expression thenExpr) {
         notifyPropertyChange(ObservableProperty.THEN_EXPR, this.thenExpr, thenExpr);
         this.thenExpr = assertNotNull(thenExpr);
-		setAsParentNodeOf(this.thenExpr);
+        setAsParentNodeOf(this.thenExpr);
         return this;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index 9949a9fb3..5dfa1fe33 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,23 +30,25 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public final class DoubleLiteralExpr extends StringLiteralExpr {
 
-	public DoubleLiteralExpr() {
+    public DoubleLiteralExpr() {
         this(null, "0");
-	}
+    }
 
-	public DoubleLiteralExpr(final String value) {
-		this(null, value);
-	}
+    public DoubleLiteralExpr(final String value) {
+        this(null, value);
+    }
 
-	public DoubleLiteralExpr(final Range range, final String value) {
-		super(range, value);
-	}
+    public DoubleLiteralExpr(final Range range, final String value) {
+        super(range, value);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
index e720b17ea..6487c4b60 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -33,43 +33,45 @@ import java.util.Optional;
  */
 public final class EnclosedExpr extends Expression {
 
-	private Expression inner;
+    private Expression inner;
 
-	public EnclosedExpr() {
+    public EnclosedExpr() {
         this(null, new StringLiteralExpr());
-	}
+    }
 
-	public EnclosedExpr(final Expression inner) {
-		this(null, inner);
-	}
+    public EnclosedExpr(final Expression inner) {
+        this(null, inner);
+    }
 
-	public EnclosedExpr(final Range range, final Expression inner) {
-		super(range);
-		setInner(inner);
-	}
+    public EnclosedExpr(final Range range, final Expression inner) {
+        super(range);
+        setInner(inner);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
     public Optional<Expression> getInner() {
         return Optional.ofNullable(inner);
-	}
+    }
 
     /**
      * Sets the inner expression
-     * 
+     *
      * @param inner the inner expression, can be null
      * @return this, the EnclosedExpr
      */
-	public EnclosedExpr setInner(final Expression inner) {
-		notifyPropertyChange(ObservableProperty.INNER, this.inner, inner);
-		this.inner = inner;
-		setAsParentNodeOf(this.inner);
-		return this;
-	}
+    public EnclosedExpr setInner(final Expression inner) {
+        notifyPropertyChange(ObservableProperty.INNER, this.inner, inner);
+        this.inner = inner;
+        setAsParentNodeOf(this.inner);
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
index 310632938..393aa537b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -29,6 +29,6 @@ import com.github.javaparser.ast.Node;
  */
 public abstract class Expression extends Node {
     public Expression(Range range) {
-		super(range);
-	}
+        super(range);
+    }
 }
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 fafdb1d88..9c8e3b4dc 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
@@ -86,13 +86,13 @@ public final class FieldAccessExpr extends Expression implements NodeWithTypeArg
     public FieldAccessExpr setFieldExpr(SimpleName inner) {
         notifyPropertyChange(ObservableProperty.FIELD, this.field, inner);
         this.field = assertNotNull(inner);
-		setAsParentNodeOf(this.field);
+        setAsParentNodeOf(this.field);
         return this;
     }
 
     /**
      * Sets the scope
-     * 
+     *
      * @param scope the scope, can be null
      * @return this, the FieldAccessExpr
      */
@@ -110,7 +110,7 @@ public final class FieldAccessExpr extends Expression implements NodeWithTypeArg
 
     /**
      * Sets the type arguments
-     * 
+     *
      * @param types the type arguments, can be null
      * @return this, the FieldAccessExpr
      */
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index 30535fdc4..199b45566 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,33 +30,35 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public class IntegerLiteralExpr extends StringLiteralExpr {
 
-	private static final String UNSIGNED_MIN_VALUE = "2147483648";
+    private static final String UNSIGNED_MIN_VALUE = "2147483648";
 
-	static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
+    static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
 
-	public IntegerLiteralExpr() {
+    public IntegerLiteralExpr() {
         this(null, "0");
-	}
+    }
 
-	public IntegerLiteralExpr(final String value) {
-		this(null, value);
-	}
+    public IntegerLiteralExpr(final String value) {
+        this(null, value);
+    }
 
-	public IntegerLiteralExpr(final Range range, final String value) {
-		super(range, value);
-	}
+    public IntegerLiteralExpr(final Range range, final String value) {
+        super(range, value);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	public final boolean isMinValue() {
-		return value != null && //
-				value.length() == 10 && //
-				value.equals(UNSIGNED_MIN_VALUE);
-	}
+    public final boolean isMinValue() {
+        return value != null && //
+                value.length() == 10 && //
+                value.equals(UNSIGNED_MIN_VALUE);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
index 6c9465cbe..e2e0045d0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -39,71 +39,71 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  * @author Raquel Pau
  */
 public class LambdaExpr extends Expression implements
-		NodeWithParameters<LambdaExpr> {
+        NodeWithParameters<LambdaExpr> {
 
-	private NodeList<Parameter> parameters;
+    private NodeList<Parameter> parameters;
 
-	private boolean isEnclosingParameters;
+    private boolean isEnclosingParameters;
 
-	private Statement body;
+    private Statement body;
 
-	public LambdaExpr() {
+    public LambdaExpr() {
         this(null,
                 new NodeList<>(),
                 new EmptyStmt(),
                 false);
-	}
+    }
 
-	public LambdaExpr(Range range, NodeList<Parameter> parameters, Statement body,
+    public LambdaExpr(Range range, NodeList<Parameter> parameters, Statement body,
                       boolean isEnclosingParameters) {
 
-		super(range);
-		setParameters(parameters);
-		setBody(body);
+        super(range);
+        setParameters(parameters);
+        setBody(body);
         setEnclosingParameters(isEnclosingParameters);
-	}
+    }
 
     @Override
-	public NodeList<Parameter> getParameters() {
+    public NodeList<Parameter> getParameters() {
         return parameters;
-	}
-
-	@Override
-	public LambdaExpr setParameters(NodeList<Parameter> parameters) {
-	    notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters);
-		this.parameters = assertNotNull(parameters);
-		setAsParentNodeOf(this.parameters);
-		return this;
-	}
-
-	public Statement getBody() {
-		return body;
-	}
-
-	public LambdaExpr setBody(Statement body) {
-		this.body = body;
-		setAsParentNodeOf(this.body);
-		return this;
-	}
-
-	@Override
-	public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
-		return v.visit(this, arg);
-	}
-
-	@Override
-	public <A> void accept(VoidVisitor<A> v, A arg) {
-		v.visit(this, arg);
-	}
-
-	public boolean isEnclosingParameters() {
-		return isEnclosingParameters;
-	}
-
-	public LambdaExpr setEnclosingParameters(boolean enclosingParameters) {
-		notifyPropertyChange(ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, enclosingParameters);
-		this.isEnclosingParameters = enclosingParameters;
-		return this;
-	}
+    }
+
+    @Override
+    public LambdaExpr setParameters(NodeList<Parameter> parameters) {
+        notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters);
+        this.parameters = assertNotNull(parameters);
+        setAsParentNodeOf(this.parameters);
+        return this;
+    }
+
+    public Statement getBody() {
+        return body;
+    }
+
+    public LambdaExpr setBody(Statement body) {
+        this.body = body;
+        setAsParentNodeOf(this.body);
+        return this;
+    }
+
+    @Override
+    public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
+        return v.visit(this, arg);
+    }
+
+    @Override
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+        v.visit(this, arg);
+    }
+
+    public boolean isEnclosingParameters() {
+        return isEnclosingParameters;
+    }
+
+    public LambdaExpr setEnclosingParameters(boolean enclosingParameters) {
+        notifyPropertyChange(ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, enclosingParameters);
+        this.isEnclosingParameters = enclosingParameters;
+        return this;
+    }
 
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
index 4bd8a3f55..33d44de3d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -28,6 +28,6 @@ import com.github.javaparser.Range;
  */
 public abstract class LiteralExpr extends Expression {
     public LiteralExpr(Range range) {
-		super(range);
-	}
+        super(range);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
index b8101ae9a..41c37ef2b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,34 +30,36 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public class LongLiteralExpr extends StringLiteralExpr {
 
-	private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
+    private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
 
-	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
+    protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
 
-	public LongLiteralExpr() {
+    public LongLiteralExpr() {
         this(null, "0");
-	}
-
-	public LongLiteralExpr(final String value) {
-		super(value);
-	}
-
-	public LongLiteralExpr(final Range range, final String value) {
-		super(range, value);
-	}
-
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
-
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
-
-	public final boolean isMinValue() {
-		return value != null && //
-				value.length() == 20 && //
-				value.startsWith(UNSIGNED_MIN_VALUE) && //
-				(value.charAt(19) == 'L' || value.charAt(19) == 'l');
-	}
+    }
+
+    public LongLiteralExpr(final String value) {
+        super(value);
+    }
+
+    public LongLiteralExpr(final Range range, final String value) {
+        super(range, value);
+    }
+
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
+
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
+
+    public final boolean isMinValue() {
+        return value != null && //
+                value.length() == 20 && //
+                value.startsWith(UNSIGNED_MIN_VALUE) && //
+                (value.charAt(19) == 'L' || value.charAt(19) == 'l');
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
index 82fe6dd07..654372ff8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -35,57 +35,59 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public final class MemberValuePair extends Node implements NodeWithSimpleName<MemberValuePair> {
 
-	private SimpleName name;
+    private SimpleName name;
 
-	private Expression value;
+    private Expression value;
 
-	public MemberValuePair() {
+    public MemberValuePair() {
         this(null, new SimpleName(), new StringLiteralExpr());
-	}
+    }
 
-	public MemberValuePair(final String name, final Expression value) {
+    public MemberValuePair(final String name, final Expression value) {
         this(null, new SimpleName(name), value);
-	}
+    }
 
-	public MemberValuePair(final SimpleName name, final Expression value) {
+    public MemberValuePair(final SimpleName name, final Expression value) {
         this(null, name, value);
-	}
+    }
 
-	public MemberValuePair(final Range range, final SimpleName name, final Expression value) {
-		super(range);
-		setName(name);
-		setValue(value);
-	}
+    public MemberValuePair(final Range range, final SimpleName name, final Expression value) {
+        super(range);
+        setName(name);
+        setValue(value);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	@Override
-	public SimpleName getName() {
-		return name;
-	}
+    @Override
+    public SimpleName getName() {
+        return name;
+    }
 
-	public Expression getValue() {
-		return value;
-	}
+    public Expression getValue() {
+        return value;
+    }
 
     @Override
     public MemberValuePair setName(final SimpleName name) {
-	    notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-		this.name = assertNotNull(name);
+        notifyPropertyChange(ObservableProperty.NAME, this.name, name);
+        this.name = assertNotNull(name);
         setAsParentNodeOf(name);
         return this;
-	}
+    }
 
-	public MemberValuePair setValue(final Expression value) {
+    public MemberValuePair setValue(final Expression value) {
         notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
-		this.value = assertNotNull(value);
-		setAsParentNodeOf(this.value);
-		return this;
-	}
+        this.value = assertNotNull(value);
+        setAsParentNodeOf(this.value);
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
index faffe1e0b..2b4fe69f2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
@@ -38,7 +38,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 /**
  * @author Julio Vilmar Gesser
  */
-public final class MethodCallExpr extends Expression implements 
+public final class MethodCallExpr extends Expression implements
         NodeWithTypeArguments<MethodCallExpr>,
         NodeWithArguments<MethodCallExpr>,
         NodeWithSimpleName<MethodCallExpr> {
@@ -75,13 +75,13 @@ public final class MethodCallExpr extends Expression implements
                 arguments);
     }
 
-	public MethodCallExpr(final Range range, final Expression scope, final NodeList<Type<?>> typeArguments, final SimpleName name, final NodeList<Expression> arguments) {
-		super(range);
-		setScope(scope);
-		setTypeArguments(typeArguments);
-		setName(name);
-		setArguments(arguments);
-	}
+    public MethodCallExpr(final Range range, final Expression scope, final NodeList<Type<?>> typeArguments, final SimpleName name, final NodeList<Expression> arguments) {
+        super(range);
+        setScope(scope);
+        setTypeArguments(typeArguments);
+        setName(name);
+        setArguments(arguments);
+    }
 
     @Override
     public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
@@ -108,10 +108,10 @@ public final class MethodCallExpr extends Expression implements
 
     public MethodCallExpr setArguments(final NodeList<Expression> arguments) {
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-		this.arguments = assertNotNull(arguments);
-		setAsParentNodeOf(this.arguments);
+        this.arguments = assertNotNull(arguments);
+        setAsParentNodeOf(this.arguments);
         return this;
-	}
+    }
 
     @Override
     public MethodCallExpr setName(final SimpleName name) {
@@ -135,7 +135,7 @@ public final class MethodCallExpr extends Expression implements
 
     /**
      * Sets the typeArguments
-     * 
+     *
      * @param typeArguments the typeArguments, can be null
      * @return this, the MethodCallExpr
      */
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 07d8bc233..7d3b59cfa 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
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -35,12 +35,12 @@ import java.util.Optional;
 /**
  * Method reference expressions introduced in Java 8 specifically designed to simplify lambda Expressions.
  * These are some examples:
+ * <p>
+ * System.out::println;
+ * <p>
+ * (test ? stream.map(String::trim) : stream)::toArray;
  *
- * System.out::println; 
- *
- * (test ? stream.map(String::trim) : stream)::toArray; 
  * @author Raquel Pau
- *
  */
 public class MethodReferenceExpr extends Expression implements
         NodeWithTypeArguments<MethodReferenceExpr>,
@@ -96,7 +96,7 @@ public class MethodReferenceExpr extends Expression implements
 
     /**
      * Sets the typeArguments
-     * 
+     *
      * @param typeArguments the typeArguments, can be null
      * @return this, the MethodReferenceExpr
      */
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 8dab002bd..b2accdc01 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
@@ -28,10 +28,10 @@ import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import java.util.Optional;
 
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
 /**
  * A name that may consist of multiple identifiers.
  * In other words: it.may.contain.dots.
@@ -41,8 +41,8 @@ import java.util.Optional;
  * <p>
  * You can construct one from a String with the name(...) method.
  *
- * @see SimpleName
  * @author Julio Vilmar Gesser
+ * @see SimpleName
  */
 public class Name extends Node implements NodeWithIdentifier<Name> {
     private String identifier;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 0fee8d55d..fb9486376 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -72,7 +72,7 @@ public final class NormalAnnotationExpr extends AnnotationExpr {
 
     /**
      * adds a pair to this annotation
-     * 
+     *
      * @return this, the {@link NormalAnnotationExpr}
      */
     public NormalAnnotationExpr addPair(String key, String value) {
@@ -81,7 +81,7 @@ public final class NormalAnnotationExpr extends AnnotationExpr {
 
     /**
      * adds a pair to this annotation
-     * 
+     *
      * @return this, the {@link NormalAnnotationExpr}
      */
     public NormalAnnotationExpr addPair(String key, NameExpr value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
index 2c88913f0..9f7d47e53 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,19 +30,21 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public final class NullLiteralExpr extends LiteralExpr {
 
-	public NullLiteralExpr() {
+    public NullLiteralExpr() {
         this(null);
-	}
+    }
 
-	public NullLiteralExpr(final Range range) {
-		super(range);
-	}
+    public NullLiteralExpr(final Range range) {
+        super(range);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index ec5fddfee..0da457fc6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
@@ -21,10 +21,6 @@
 
 package com.github.javaparser.ast.expr;
 
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
-import java.util.Optional;
-
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.BodyDeclaration;
@@ -37,11 +33,15 @@ import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
+import java.util.Optional;
+
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
 /**
  * Defines constructor call expression.
  * Example:
  * <code>
- *     new Object()
+ * new Object()
  * </code>
  *
  * @author Julio Vilmar Gesser
@@ -72,7 +72,7 @@ public final class ObjectCreationExpr extends Expression implements
 
     /**
      * Defines a call to a constructor.
-     * 
+     *
      * @param scope may be null
      * @param type this is the class that the constructor is being called for.
      * @param arguments Any arguments to pass to the constructor
@@ -137,7 +137,7 @@ public final class ObjectCreationExpr extends Expression implements
      * Sets the anonymousClassBody<br>
      * Null means no class body<br>
      * Empty NodeList means new ClassName(){ }
-     * 
+     *
      * @param anonymousClassBody the anonymousClassBody, can be null or empty
      * @return this, the ObjectCreationExpr
      */
@@ -158,7 +158,7 @@ public final class ObjectCreationExpr extends Expression implements
 
     /**
      * Sets the scope
-     * 
+     *
      * @param scope the scope, can be null
      * @return this, the ObjectCreationExpr
      */
@@ -185,7 +185,7 @@ public final class ObjectCreationExpr extends Expression implements
 
     /**
      * Sets the typeArguments
-     * 
+     *
      * @param typeArguments the typeArguments, can be null
      * @return this, the ObjectCreationExpr
      */
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 5365bd7a4..349cd7068 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
@@ -12,6 +12,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 /**
  * A name that consists of a single identifier.
  * In other words: it.does.NOT.contain.dots.
+ *
  * @see Name
  */
 public class SimpleName extends Node implements NodeWithIdentifier<SimpleName> {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index 97a0d4e2b..62a4a4bbe 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -31,37 +31,39 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public final class SingleMemberAnnotationExpr extends AnnotationExpr {
 
-	private Expression memberValue;
+    private Expression memberValue;
 
-	public SingleMemberAnnotationExpr() {
+    public SingleMemberAnnotationExpr() {
         this(null, new Name(), new StringLiteralExpr());
-	}
+    }
 
-	public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) {
+    public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) {
         this(null, name, memberValue);
-	}
+    }
 
-	public SingleMemberAnnotationExpr(final Range range, final Name name, final Expression memberValue) {
-		super(range, name);
-		setMemberValue(memberValue);
-	}
+    public SingleMemberAnnotationExpr(final Range range, final Name name, final Expression memberValue) {
+        super(range, name);
+        setMemberValue(memberValue);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	public Expression getMemberValue() {
-		return memberValue;
-	}
+    public Expression getMemberValue() {
+        return memberValue;
+    }
 
-	public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) {
-		notifyPropertyChange(ObservableProperty.MEMBER_VALUE, this.memberValue, memberValue);
-		this.memberValue = memberValue;
-		setAsParentNodeOf(this.memberValue);
-		return this;
-	}
+    public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) {
+        notifyPropertyChange(ObservableProperty.MEMBER_VALUE, this.memberValue, memberValue);
+        this.memberValue = memberValue;
+        setAsParentNodeOf(this.memberValue);
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
index 596f0f8c9..c9428e07c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -31,50 +31,53 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
  * Java® Language Specification 3.10.5 String Literals
+ *
  * @author Julio Vilmar Gesser
  */
 public class StringLiteralExpr extends LiteralExpr {
 
-	protected String value;
+    protected String value;
 
-	public StringLiteralExpr() {
+    public StringLiteralExpr() {
         this(null, "empty");
-	}
+    }
 
-	public StringLiteralExpr(final String value) {
-		this(null, value);
-	}
+    public StringLiteralExpr(final String value) {
+        this(null, value);
+    }
 
-	/**
-	 * Utility method that creates a new StringLiteralExpr. Escapes EOL characters.
-	 */
-	public static StringLiteralExpr escape(String string) {
-		return new StringLiteralExpr(Utils.escapeEndOfLines(string));
-	}
+    /**
+     * Utility method that creates a new StringLiteralExpr. Escapes EOL characters.
+     */
+    public static StringLiteralExpr escape(String string) {
+        return new StringLiteralExpr(Utils.escapeEndOfLines(string));
+    }
 
-	public StringLiteralExpr(final Range range, final String value) {
-		super(range);
-		setValue(value);
-	}
+    public StringLiteralExpr(final Range range, final String value) {
+        super(range);
+        setValue(value);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	public final String getValue() {
-		return value;
-	}
+    public final String getValue() {
+        return value;
+    }
 
-	public final StringLiteralExpr setValue(final String value) {
-		notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
+    public final StringLiteralExpr setValue(final String value) {
+        notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
         this.value = assertNotNull(value);
         if (value.contains("\n") || value.contains("\r")) {
             throw new IllegalArgumentException("Illegal literal expression: newlines (line feed or carriage return) have to be escaped");
         }
         return this;
-	}
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
index 062eca480..ac468152c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -33,43 +33,45 @@ import java.util.Optional;
  */
 public final class SuperExpr extends Expression {
 
-	private Expression classExpr;
+    private Expression classExpr;
 
-	public SuperExpr() {
+    public SuperExpr() {
         this(null, null);
-	}
+    }
 
-	public SuperExpr(final Expression classExpr) {
-		this(null, classExpr);
-	}
+    public SuperExpr(final Expression classExpr) {
+        this(null, classExpr);
+    }
 
-	public SuperExpr(final Range range, final Expression classExpr) {
-		super(range);
-		setClassExpr(classExpr);
-	}
+    public SuperExpr(final Range range, final Expression classExpr) {
+        super(range);
+        setClassExpr(classExpr);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
     public Optional<Expression> getClassExpr() {
         return Optional.ofNullable(classExpr);
-	}
+    }
 
     /**
      * Sets the classExpr
-     * 
+     *
      * @param classExpr the classExpr, can be null
      * @return this, the SuperExpr
      */
-	public SuperExpr setClassExpr(final Expression classExpr) {
-		notifyPropertyChange(ObservableProperty.CLASS_EXPR, this.classExpr, classExpr);
-		this.classExpr = classExpr;
-		setAsParentNodeOf(this.classExpr);
-		return this;
-	}
+    public SuperExpr setClassExpr(final Expression classExpr) {
+        notifyPropertyChange(ObservableProperty.CLASS_EXPR, this.classExpr, classExpr);
+        this.classExpr = classExpr;
+        setAsParentNodeOf(this.classExpr);
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
index aa3bbc193..01a7ec0e5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
@@ -18,52 +18,54 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
-package com.github.javaparser.ast.expr;
 
-import java.util.Optional;
+package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
+import java.util.Optional;
+
 /**
  * @author Julio Vilmar Gesser
  */
 public final class ThisExpr extends Expression {
 
-	private Expression classExpr;
+    private Expression classExpr;
 
-	public ThisExpr() {
-        this(null, null); 
-	}
+    public ThisExpr() {
+        this(null, null);
+    }
 
-	public ThisExpr(final Expression classExpr) {
-		this(null, classExpr);
-	}
+    public ThisExpr(final Expression classExpr) {
+        this(null, classExpr);
+    }
 
-	public ThisExpr(final Range range, final Expression classExpr) {
-		super(range);
-		setClassExpr(classExpr);
-	}
+    public ThisExpr(final Range range, final Expression classExpr) {
+        super(range);
+        setClassExpr(classExpr);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	public Optional<Expression> getClassExpr() {
-		return Optional.ofNullable(classExpr);
-	}
+    public Optional<Expression> getClassExpr() {
+        return Optional.ofNullable(classExpr);
+    }
 
-	public ThisExpr setClassExpr(final Expression classExpr) {
-		notifyPropertyChange(ObservableProperty.CLASS_EXPR, this.classExpr, classExpr);
-		this.classExpr = classExpr;
-		setAsParentNodeOf(this.classExpr);
-		return this;
-	}
+    public ThisExpr setClassExpr(final Expression classExpr) {
+        notifyPropertyChange(ObservableProperty.CLASS_EXPR, this.classExpr, classExpr);
+        this.classExpr = classExpr;
+        setAsParentNodeOf(this.classExpr);
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
index 4fbf23e43..65a8bf472 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -33,8 +33,8 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
  * This class is just instantiated as scopes for MethodReferenceExpr nodes to encapsulate Types.
- * @author Raquel Pau
  *
+ * @author Raquel Pau
  */
 public class TypeExpr extends Expression implements NodeWithType<TypeExpr, Type<?>> {
 
@@ -73,5 +73,4 @@ public class TypeExpr extends Expression implements NodeWithType<TypeExpr, Type<
     }
 
 
-
 }
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 e0235cba5..63776cdc9 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
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
- 
+
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,10 +30,10 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 /**
  * @author Julio Vilmar Gesser
  */
-public final class UnaryExpr extends Expression implements 
+public final class UnaryExpr extends Expression implements
         NodeWithExpression<UnaryExpr> {
 
-	public enum Operator {
+    public enum Operator {
         PLUS("+", false),
         MINUS("-", false),
         PREFIX_INCREMENT("++", false),
@@ -50,7 +50,7 @@ public final class UnaryExpr extends Expression implements
             this.codeRepresentation = codeRepresentation;
             this.isPostfix = isPostfix;
         }
-        
+
         public String asString() {
             return codeRepresentation;
         }
@@ -58,58 +58,60 @@ public final class UnaryExpr extends Expression implements
         public boolean isPostfix() {
             return isPostfix;
         }
-        
+
         public boolean isPrefix() {
             return !isPostfix();
         }
     }
 
-	private Expression expression;
+    private Expression expression;
 
-	private Operator operator;
+    private Operator operator;
 
-	public UnaryExpr() {
+    public UnaryExpr() {
         this(null, new IntegerLiteralExpr(), Operator.POSTFIX_INCREMENT);
-	}
+    }
 
-	public UnaryExpr(final Expression expression, final Operator operator) {
+    public UnaryExpr(final Expression expression, final Operator operator) {
         this(null, expression, operator);
-	}
+    }
 
-	public UnaryExpr(final Range range, final Expression expression, final Operator operator) {
-		super(range);
-		setExpression(expression);
-		setOperator(operator);
-	}
+    public UnaryExpr(final Range range, final Expression expression, final Operator operator) {
+        super(range);
+        setExpression(expression);
+        setOperator(operator);
+    }
 
-	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-		return v.visit(this, arg);
-	}
+    @Override
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
 
-	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
-		v.visit(this, arg);
-	}
+    @Override
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
 
-	@Override
-	public Expression getExpression() {
-		return expression;
-	}
+    @Override
+    public Expression getExpression() {
+        return expression;
+    }
 
-	public Operator getOperator() {
-		return operator;
-	}
+    public Operator getOperator() {
+        return operator;
+    }
 
     @Override
-	public UnaryExpr setExpression(final Expression expr) {
-		notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expr);
-		this.expression = expr;
-		setAsParentNodeOf(this.expression);
-		return this;
-	}
-
-	public UnaryExpr setOperator(final Operator op) {
-		notifyPropertyChange(ObservableProperty.OPERATOR, this.operator, op);
-		this.operator = op;
-		return this;
-	}
+    public UnaryExpr setExpression(final Expression expr) {
+        notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expr);
+        this.expression = expr;
+        setAsParentNodeOf(this.expression);
+        return this;
+    }
+
+    public UnaryExpr setOperator(final Operator 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/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 5c9970600..a832f88dd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -56,13 +56,17 @@ public final class VariableDeclarationExpr extends Expression implements
 
     private NodeList<AnnotationExpr> annotations;
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     private Type elementType;
 
     private NodeList<VariableDeclarator> variables;
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterType;
 
@@ -161,16 +165,18 @@ public final class VariableDeclarationExpr extends Expression implements
 
     /**
      * Return the modifiers of this variable declaration.
-     * 
-     * @see Modifier
+     *
      * @return modifiers
+     * @see Modifier
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
         return modifiers;
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     @Override
     public Type getElementType() {
@@ -197,7 +203,9 @@ public final class VariableDeclarationExpr extends Expression implements
         return this;
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     @Override
     public VariableDeclarationExpr setElementType(final Type elementType) {
@@ -215,13 +223,17 @@ public final class VariableDeclarationExpr extends Expression implements
         return this;
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     public NodeList<ArrayBracketPair> getArrayBracketPairsAfterElementType() {
         return arrayBracketPairsAfterType;
     }
 
-    /** @deprecated will be removed in 3.0 */
+    /**
+     * @deprecated will be removed in 3.0
+     */
     @Deprecated
     @Override
     public VariableDeclarationExpr setArrayBracketPairsAfterElementType(NodeList<ArrayBracketPair> arrayBracketPairsAfterType) {