From fed74aec2acf3dbe46e0d600026afadf2402d740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florent=20B=C3=A9cart?= Date: Mon, 20 Jun 2011 15:48:00 -0700 Subject: [PATCH] Code reformat --- .../sf/jsqlparser/JSQLParserException.java | 3 +- .../expression/AllComparisonExpression.java | 6 +- .../expression/AnyComparisonExpression.java | 4 +- .../expression/BinaryExpression.java | 10 +- .../jsqlparser/expression/CaseExpression.java | 52 +- .../sf/jsqlparser/expression/DateValue.java | 7 +- .../sf/jsqlparser/expression/DoubleValue.java | 10 +- .../sf/jsqlparser/expression/Expression.java | 3 +- .../expression/ExpressionVisitor.java | 43 +- .../sf/jsqlparser/expression/Function.java | 75 +-- .../expression/InverseExpression.java | 6 +- .../jsqlparser/expression/JdbcParameter.java | 2 +- .../sf/jsqlparser/expression/LongValue.java | 8 +- .../sf/jsqlparser/expression/NullValue.java | 4 +- .../sf/jsqlparser/expression/Parenthesis.java | 13 +- .../sf/jsqlparser/expression/StringValue.java | 16 +- .../sf/jsqlparser/expression/TimeValue.java | 9 +- .../jsqlparser/expression/TimestampValue.java | 9 +- .../sf/jsqlparser/expression/WhenClause.java | 23 +- .../operators/arithmetic/Addition.java | 5 +- .../operators/arithmetic/BitwiseAnd.java | 7 +- .../operators/arithmetic/BitwiseOr.java | 7 +- .../operators/arithmetic/BitwiseXor.java | 7 +- .../operators/arithmetic/Concat.java | 2 +- .../operators/arithmetic/Division.java | 4 +- .../operators/arithmetic/Multiplication.java | 2 +- .../operators/arithmetic/Subtraction.java | 4 +- .../operators/conditional/AndExpression.java | 6 +- .../operators/conditional/OrExpression.java | 4 +- .../operators/relational/Between.java | 7 +- .../operators/relational/EqualsTo.java | 4 +- .../relational/ExistsExpression.java | 5 +- .../operators/relational/ExpressionList.java | 4 +- .../operators/relational/GreaterThan.java | 3 +- .../relational/GreaterThanEquals.java | 3 +- .../operators/relational/InExpression.java | 12 +- .../relational/IsNullExpression.java | 9 +- .../relational/ItemsListVisitor.java | 3 +- .../operators/relational/LikeExpression.java | 31 +- .../operators/relational/MinorThan.java | 3 +- .../operators/relational/MinorThanEquals.java | 4 +- .../operators/relational/NotEqualsTo.java | 4 +- .../parser/CCJSqlParserManager.java | 3 +- src/net/sf/jsqlparser/schema/Column.java | 19 +- src/net/sf/jsqlparser/schema/Table.java | 19 +- .../sf/jsqlparser/statement/Statement.java | 5 +- .../statement/StatementVisitor.java | 7 + .../statement/create/table/ColDataType.java | 35 +- .../create/table/ColumnDefinition.java | 8 +- .../statement/create/table/CreateTable.java | 138 +++--- .../statement/create/table/Index.java | 76 +-- .../jsqlparser/statement/delete/Delete.java | 6 +- .../sf/jsqlparser/statement/drop/Drop.java | 12 +- .../jsqlparser/statement/insert/Insert.java | 40 +- .../jsqlparser/statement/replace/Replace.java | 63 ++- .../statement/select/AllColumns.java | 3 +- .../statement/select/AllTableColumns.java | 7 +- .../jsqlparser/statement/select/Distinct.java | 13 +- .../jsqlparser/statement/select/FromItem.java | 7 +- .../statement/select/FromItemVisitor.java | 6 +- .../sf/jsqlparser/statement/select/Join.java | 29 +- .../sf/jsqlparser/statement/select/Limit.java | 21 +- .../statement/select/OrderByElement.java | 11 +- .../statement/select/OrderByVisitor.java | 2 +- .../statement/select/PlainSelect.java | 83 ++-- .../jsqlparser/statement/select/Select.java | 8 +- .../statement/select/SelectBody.java | 2 +- .../select/SelectExpressionItem.java | 6 +- .../statement/select/SelectItemVisitor.java | 2 + .../statement/select/SelectVisitor.java | 1 + .../jsqlparser/statement/select/SubJoin.java | 9 +- .../statement/select/SubSelect.java | 5 +- .../sf/jsqlparser/statement/select/Top.java | 10 +- .../sf/jsqlparser/statement/select/Union.java | 18 +- .../jsqlparser/statement/select/WithItem.java | 23 +- .../statement/truncate/Truncate.java | 2 +- .../jsqlparser/statement/update/Update.java | 2 + .../util/deparser/CreateTableDeParser.java | 12 +- .../util/deparser/DeleteDeParser.java | 15 +- .../util/deparser/ExpressionDeParser.java | 454 +++++++++--------- .../util/deparser/InsertDeParser.java | 24 +- .../util/deparser/ReplaceDeParser.java | 19 +- .../util/deparser/SelectDeParser.java | 36 +- .../util/deparser/StatementDeParser.java | 2 +- .../util/deparser/UpdateDeParser.java | 18 +- .../net/sf/jsqlparser/test/TestException.java | 3 +- .../test/create/CreateTableTest.java | 29 +- .../sf/jsqlparser/test/delete/DeleteTest.java | 2 +- .../net/sf/jsqlparser/test/drop/DropTest.java | 12 +- .../sf/jsqlparser/test/insert/InsertTest.java | 29 +- .../jsqlparser/test/replace/ReplaceTest.java | 19 +- .../sf/jsqlparser/test/select/MemoryTest.java | 102 ++-- .../sf/jsqlparser/test/select/SelectTest.java | 399 +++++++-------- .../sf/jsqlparser/test/select/SpeedTest.java | 13 +- .../CCJSqlParserManagerTest.java | 7 +- .../test/tablesfinder/TablesNamesFinder.java | 28 +- .../tablesfinder/TablesNamesFinderTest.java | 24 +- .../test/truncate/TruncateTest.java | 4 +- .../sf/jsqlparser/test/update/UpdateTest.java | 1 + 99 files changed, 1224 insertions(+), 1172 deletions(-) diff --git a/src/net/sf/jsqlparser/JSQLParserException.java b/src/net/sf/jsqlparser/JSQLParserException.java index 177a5a706..812acbc04 100644 --- a/src/net/sf/jsqlparser/JSQLParserException.java +++ b/src/net/sf/jsqlparser/JSQLParserException.java @@ -22,7 +22,6 @@ package net.sf.jsqlparser; - /** * An exception class with stack trace informations */ @@ -45,7 +44,7 @@ public JSQLParserException(String arg0, Throwable arg1) { super(arg0); this.cause = arg1; } - + public Throwable getCause() { return cause; } diff --git a/src/net/sf/jsqlparser/expression/AllComparisonExpression.java b/src/net/sf/jsqlparser/expression/AllComparisonExpression.java index cada5204e..111653459 100644 --- a/src/net/sf/jsqlparser/expression/AllComparisonExpression.java +++ b/src/net/sf/jsqlparser/expression/AllComparisonExpression.java @@ -4,15 +4,15 @@ public class AllComparisonExpression implements Expression { private SubSelect subSelect; - + public AllComparisonExpression(SubSelect subSelect) { this.subSelect = subSelect; } - + public SubSelect GetSubSelect() { return subSelect; } - + public void accept(ExpressionVisitor expressionVisitor) { expressionVisitor.visit(this); } diff --git a/src/net/sf/jsqlparser/expression/AnyComparisonExpression.java b/src/net/sf/jsqlparser/expression/AnyComparisonExpression.java index 19e05abfd..07e286fc4 100644 --- a/src/net/sf/jsqlparser/expression/AnyComparisonExpression.java +++ b/src/net/sf/jsqlparser/expression/AnyComparisonExpression.java @@ -4,11 +4,11 @@ public class AnyComparisonExpression implements Expression { private SubSelect subSelect; - + public AnyComparisonExpression(SubSelect subSelect) { this.subSelect = subSelect; } - + public SubSelect GetSubSelect() { return subSelect; } diff --git a/src/net/sf/jsqlparser/expression/BinaryExpression.java b/src/net/sf/jsqlparser/expression/BinaryExpression.java index 02b13ef5b..cf5a21b91 100644 --- a/src/net/sf/jsqlparser/expression/BinaryExpression.java +++ b/src/net/sf/jsqlparser/expression/BinaryExpression.java @@ -22,10 +22,9 @@ package net.sf.jsqlparser.expression; - /** - * A basic class for binary expressions, that is expressions having a left member and a right member - * which are in turn expressions. + * A basic class for binary expressions, that is expressions having a left member and a right member which are in turn + * expressions. */ public abstract class BinaryExpression implements Expression { private Expression leftExpression; @@ -34,7 +33,6 @@ public abstract class BinaryExpression implements Expression { public BinaryExpression() { } - public Expression getLeftExpression() { return leftExpression; @@ -61,9 +59,9 @@ public boolean isNot() { } public String toString() { - return (not? "NOT ":"") + getLeftExpression()+" "+getStringExpression()+" "+getRightExpression(); + return (not ? "NOT " : "") + getLeftExpression() + " " + getStringExpression() + " " + getRightExpression(); } public abstract String getStringExpression(); - + } diff --git a/src/net/sf/jsqlparser/expression/CaseExpression.java b/src/net/sf/jsqlparser/expression/CaseExpression.java index 7f4993c89..f75a40a30 100644 --- a/src/net/sf/jsqlparser/expression/CaseExpression.java +++ b/src/net/sf/jsqlparser/expression/CaseExpression.java @@ -29,8 +29,7 @@ /** * CASE/WHEN expression. * - * Syntax: - * 
+ * Syntax: 
  * CASE 
  * WHEN condition THEN expression
  * [WHEN condition THEN expression]...
@@ -49,72 +48,79 @@
  * [ELSE expression]
  * END
  * 

- *  
- *  See also:
- *  https://aurora.vcu.edu/db2help/db2s0/frame3.htm#casexp
- *  http://sybooks.sybase.com/onlinebooks/group-as/asg1251e/commands/@ebt-link;pt=5954?target=%25N%15_52628_START_RESTART_N%25
- *  
- *  
+ * 
+ * See also: https://aurora.vcu.edu/db2help/db2s0/frame3.htm#casexp
+ * http://sybooks.sybase.com/onlinebooks/group-as/asg1251e
+ * /commands/@ebt-link;pt=5954?target=%25N%15_52628_START_RESTART_N%25
+ * 
+ * 
  * @author Havard Rast Blok
  */
 public class CaseExpression implements Expression {
 
 	private Expression switchExpression;
-	
+
 	private List whenClauses;
-	
+
 	private Expression elseExpression;
-	
-	/* (non-Javadoc)
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.sf.jsqlparser.expression.Expression#accept(net.sf.jsqlparser.expression.ExpressionVisitor)
 	 */
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	/**
 	 * @return Returns the switchExpression.
 	 */
 	public Expression getSwitchExpression() {
 		return switchExpression;
 	}
+
 	/**
-	 * @param switchExpression The switchExpression to set.
+	 * @param switchExpression
+	 *            The switchExpression to set.
 	 */
 	public void setSwitchExpression(Expression switchExpression) {
 		this.switchExpression = switchExpression;
 	}
-	
+
 	/**
 	 * @return Returns the elseExpression.
 	 */
 	public Expression getElseExpression() {
 		return elseExpression;
 	}
+
 	/**
-	 * @param elseExpression The elseExpression to set.
+	 * @param elseExpression
+	 *            The elseExpression to set.
 	 */
 	public void setElseExpression(Expression elseExpression) {
 		this.elseExpression = elseExpression;
 	}
+
 	/**
 	 * @return Returns the whenClauses.
 	 */
 	public List getWhenClauses() {
 		return whenClauses;
 	}
-	
+
 	/**
-	 * @param whenClauses The whenClauses to set.
+	 * @param whenClauses
+	 *            The whenClauses to set.
 	 */
 	public void setWhenClauses(List whenClauses) {
 		this.whenClauses = whenClauses;
 	}
-	
+
 	public String toString() {
-		return "CASE "+((switchExpression!=null)?switchExpression+" ":"")+
-				PlainSelect.getStringList(whenClauses,false, false)+" "+
-				((elseExpression!=null)?"ELSE "+elseExpression+" ":"")+
-				"END";
+		return "CASE " + ((switchExpression != null) ? switchExpression + " " : "")
+				+ PlainSelect.getStringList(whenClauses, false, false) + " "
+				+ ((elseExpression != null) ? "ELSE " + elseExpression + " " : "") + "END";
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/DateValue.java b/src/net/sf/jsqlparser/expression/DateValue.java
index cc9e01a7d..76c381007 100644
--- a/src/net/sf/jsqlparser/expression/DateValue.java
+++ b/src/net/sf/jsqlparser/expression/DateValue.java
@@ -24,7 +24,6 @@
 import java.sql.Date;
 import java.text.SimpleDateFormat;
 
-
 /**
  * A Date in the form {d 'yyyy-mm-dd'}
  */
@@ -32,14 +31,13 @@ public class DateValue implements Expression {
 	private Date value;
 
 	public DateValue(String value) {
-		this.value = Date.valueOf(value.substring(1, value.length()-1));
+		this.value = Date.valueOf(value.substring(1, value.length() - 1));
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public Date getValue() {
 		return value;
 	}
@@ -48,5 +46,4 @@ public void setValue(Date d) {
 		value = d;
 	}
 
-
 }
diff --git a/src/net/sf/jsqlparser/expression/DoubleValue.java b/src/net/sf/jsqlparser/expression/DoubleValue.java
index 27ca11d38..fce2f6eea 100644
--- a/src/net/sf/jsqlparser/expression/DoubleValue.java
+++ b/src/net/sf/jsqlparser/expression/DoubleValue.java
@@ -21,7 +21,6 @@
  */
 package net.sf.jsqlparser.expression;
 
-
 /**
  * Every number with a point or a exponential format is a DoubleValue
  */
@@ -30,18 +29,17 @@ public class DoubleValue implements Expression {
 	private String stringValue;
 
 	public DoubleValue(String value) {
-	    if (value.charAt(0) == '+') {
-	        value = value.substring(1);
-	    }
+		if (value.charAt(0) == '+') {
+			value = value.substring(1);
+		}
 		this.value = Double.parseDouble(value);
 		this.stringValue = value;
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public double getValue() {
 		return value;
 	}
diff --git a/src/net/sf/jsqlparser/expression/Expression.java b/src/net/sf/jsqlparser/expression/Expression.java
index 9f690e09b..5e21ed268 100644
--- a/src/net/sf/jsqlparser/expression/Expression.java
+++ b/src/net/sf/jsqlparser/expression/Expression.java
@@ -19,9 +19,8 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
- package net.sf.jsqlparser.expression;
 
+package net.sf.jsqlparser.expression;
 
 public interface Expression {
 	public void accept(ExpressionVisitor expressionVisitor);
diff --git a/src/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/net/sf/jsqlparser/expression/ExpressionVisitor.java
index 54ca884f6..3c18ac37e 100644
--- a/src/net/sf/jsqlparser/expression/ExpressionVisitor.java
+++ b/src/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -19,8 +19,8 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
- package net.sf.jsqlparser.expression;
+
+package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
 import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
@@ -49,44 +49,81 @@
 
 public interface ExpressionVisitor {
 	public void visit(NullValue nullValue);
+
 	public void visit(Function function);
+
 	public void visit(InverseExpression inverseExpression);
+
 	public void visit(JdbcParameter jdbcParameter);
+
 	public void visit(DoubleValue doubleValue);
+
 	public void visit(LongValue longValue);
+
 	public void visit(DateValue dateValue);
+
 	public void visit(TimeValue timeValue);
+
 	public void visit(TimestampValue timestampValue);
+
 	public void visit(Parenthesis parenthesis);
+
 	public void visit(StringValue stringValue);
+
 	public void visit(Addition addition);
+
 	public void visit(Division division);
+
 	public void visit(Multiplication multiplication);
+
 	public void visit(Subtraction subtraction);
+
 	public void visit(AndExpression andExpression);
+
 	public void visit(OrExpression orExpression);
+
 	public void visit(Between between);
+
 	public void visit(EqualsTo equalsTo);
+
 	public void visit(GreaterThan greaterThan);
+
 	public void visit(GreaterThanEquals greaterThanEquals);
+
 	public void visit(InExpression inExpression);
+
 	public void visit(IsNullExpression isNullExpression);
+
 	public void visit(LikeExpression likeExpression);
+
 	public void visit(MinorThan minorThan);
+
 	public void visit(MinorThanEquals minorThanEquals);
+
 	public void visit(NotEqualsTo notEqualsTo);
+
 	public void visit(Column tableColumn);
+
 	public void visit(SubSelect subSelect);
+
 	public void visit(CaseExpression caseExpression);
+
 	public void visit(WhenClause whenClause);
+
 	public void visit(ExistsExpression existsExpression);
+
 	public void visit(AllComparisonExpression allComparisonExpression);
+
 	public void visit(AnyComparisonExpression anyComparisonExpression);
+
 	public void visit(Concat concat);
+
 	public void visit(Matches matches);
+
 	public void visit(BitwiseAnd bitwiseAnd);
+
 	public void visit(BitwiseOr bitwiseOr);
-	public void visit(BitwiseXor bitwiseXor);
 
+	public void visit(BitwiseXor bitwiseXor);
 
 }
diff --git a/src/net/sf/jsqlparser/expression/Function.java b/src/net/sf/jsqlparser/expression/Function.java
index c4479d016..6ca0883fd 100644
--- a/src/net/sf/jsqlparser/expression/Function.java
+++ b/src/net/sf/jsqlparser/expression/Function.java
@@ -34,13 +34,14 @@ public class Function implements Expression {
 	private boolean allColumns = false;
 	private boolean distinct = false;
 	private boolean isEscaped = false;
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	/**
 	 * The name of he function, i.e. "MAX"
+	 * 
 	 * @return the name of he function
 	 */
 	public String getName() {
@@ -53,6 +54,7 @@ public void setName(String string) {
 
 	/**
 	 * true if the parameter to the function is "*"
+	 * 
 	 * @return true if the parameter to the function is "*"
 	 */
 	public boolean isAllColumns() {
@@ -65,6 +67,7 @@ public void setAllColumns(boolean b) {
 
 	/**
 	 * true if the function is "distinct"
+	 * 
 	 * @return true if the function is "distinct"
 	 */
 	public boolean isDistinct() {
@@ -76,8 +79,8 @@ public void setDistinct(boolean b) {
 	}
 
 	/**
-	 * The list of parameters of the function (if any, else null)
-	 * If the parameter is "*", allColumns is set to true
+	 * The list of parameters of the function (if any, else null) If the parameter is "*", allColumns is set to true
+	 * 
 	 * @return the list of parameters of the function (if any, else null)
 	 */
 	public ExpressionList getParameters() {
@@ -88,37 +91,37 @@ public void setParameters(ExpressionList list) {
 		parameters = list;
 	}
 
-    /**
-     * Return true if it's in the form "{fn function_body() }" 
-     * @return true if it's java-escaped
-     */
-    public boolean isEscaped() {
-        return isEscaped;
-    }
-    
-    public void setEscaped(boolean isEscaped) {
-        this.isEscaped = isEscaped;
-    }
-
-    public String toString() {
-    	String params = "";
-    	
-    	if(allColumns) {
-    		params = "(*)";
-    	}
-    	else if(parameters != null) {
+	/**
+	 * Return true if it's in the form "{fn function_body() }"
+	 * 
+	 * @return true if it's java-escaped
+	 */
+	public boolean isEscaped() {
+		return isEscaped;
+	}
+
+	public void setEscaped(boolean isEscaped) {
+		this.isEscaped = isEscaped;
+	}
+
+	public String toString() {
+		String params = "";
+
+		if (allColumns) {
+			params = "(*)";
+		} else if (parameters != null) {
 			params = parameters.toString();
-    		if (isDistinct()) {
-    			params = params.replaceFirst("\\(", "(DISTINCT ");
-    		} 
-    	}
-    	
-    	String ans = name+""+params+"";
-    	
-    	if(isEscaped) {
-    		ans = "{fn "+ans+"}"; 
-    	}
-    	
-    	return ans;
-    }
+			if (isDistinct()) {
+				params = params.replaceFirst("\\(", "(DISTINCT ");
+			}
+		}
+
+		String ans = name + "" + params + "";
+
+		if (isEscaped) {
+			ans = "{fn " + ans + "}";
+		}
+
+		return ans;
+	}
 }
diff --git a/src/net/sf/jsqlparser/expression/InverseExpression.java b/src/net/sf/jsqlparser/expression/InverseExpression.java
index a05bc7a1e..3e0412df9 100644
--- a/src/net/sf/jsqlparser/expression/InverseExpression.java
+++ b/src/net/sf/jsqlparser/expression/InverseExpression.java
@@ -19,15 +19,15 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
- * It represents a "-" before an expression 
+ * It represents a "-" before an expression
  */
 public class InverseExpression implements Expression {
 	private Expression expression;
-	
+
 	public InverseExpression() {
 	}
 
diff --git a/src/net/sf/jsqlparser/expression/JdbcParameter.java b/src/net/sf/jsqlparser/expression/JdbcParameter.java
index b13ecdeff..7d0123914 100644
--- a/src/net/sf/jsqlparser/expression/JdbcParameter.java
+++ b/src/net/sf/jsqlparser/expression/JdbcParameter.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
diff --git a/src/net/sf/jsqlparser/expression/LongValue.java b/src/net/sf/jsqlparser/expression/LongValue.java
index 1c001e27a..4799eb05e 100644
--- a/src/net/sf/jsqlparser/expression/LongValue.java
+++ b/src/net/sf/jsqlparser/expression/LongValue.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
@@ -30,9 +30,9 @@ public class LongValue implements Expression {
 	private String stringValue;
 
 	public LongValue(String value) {
-	    if (value.charAt(0) == '+') {
-	        value = value.substring(1);
-	    }
+		if (value.charAt(0) == '+') {
+			value = value.substring(1);
+		}
 		this.value = Long.parseLong(value);
 		setStringValue(value);
 	}
diff --git a/src/net/sf/jsqlparser/expression/NullValue.java b/src/net/sf/jsqlparser/expression/NullValue.java
index 463acca1f..33c77e4ca 100644
--- a/src/net/sf/jsqlparser/expression/NullValue.java
+++ b/src/net/sf/jsqlparser/expression/NullValue.java
@@ -19,11 +19,11 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
- *  A "NULL" in a sql statement
+ * A "NULL" in a sql statement
  */
 public class NullValue implements Expression {
 	public void accept(ExpressionVisitor expressionVisitor) {
diff --git a/src/net/sf/jsqlparser/expression/Parenthesis.java b/src/net/sf/jsqlparser/expression/Parenthesis.java
index 1c8341145..6eea33da6 100644
--- a/src/net/sf/jsqlparser/expression/Parenthesis.java
+++ b/src/net/sf/jsqlparser/expression/Parenthesis.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
@@ -31,12 +31,11 @@ public class Parenthesis implements Expression {
 
 	public Parenthesis() {
 	}
-	
-	
+
 	public Parenthesis(Expression expression) {
-		setExpression(expression); 
+		setExpression(expression);
 	}
-	
+
 	public Expression getExpression() {
 		return expression;
 	}
@@ -56,8 +55,8 @@ public void setNot() {
 	public boolean isNot() {
 		return not;
 	}
-	
+
 	public String toString() {
-		return (not? "NOT ":"") + "("+expression+")";
+		return (not ? "NOT " : "") + "(" + expression + ")";
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/StringValue.java b/src/net/sf/jsqlparser/expression/StringValue.java
index fffe765a6..5cc1f8307 100644
--- a/src/net/sf/jsqlparser/expression/StringValue.java
+++ b/src/net/sf/jsqlparser/expression/StringValue.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression;
 
 /**
@@ -27,12 +27,12 @@
  */
 public class StringValue implements Expression {
 	private String value = "";
-	
+
 	public StringValue(String escapedValue) {
-		// romoving "'" at the start and at the end 
+		// romoving "'" at the start and at the end
 		value = escapedValue.substring(1, escapedValue.length() - 1);
 	}
-	
+
 	public String getValue() {
 		return value;
 	}
@@ -42,8 +42,8 @@ public String getNotExcapedValue() {
 		int index = 0;
 		int deletesNum = 0;
 		while ((index = value.indexOf("''", index)) != -1) {
-			buffer.deleteCharAt(index-deletesNum);
-			index+=2;
+			buffer.deleteCharAt(index - deletesNum);
+			index += 2;
 			deletesNum++;
 		}
 		return buffer.toString();
@@ -52,12 +52,12 @@ public String getNotExcapedValue() {
 	public void setValue(String string) {
 		value = string;
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
 	public String toString() {
-		return "'"+value+"'";
+		return "'" + value + "'";
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/TimeValue.java b/src/net/sf/jsqlparser/expression/TimeValue.java
index ea7c3db70..34f94a1a1 100644
--- a/src/net/sf/jsqlparser/expression/TimeValue.java
+++ b/src/net/sf/jsqlparser/expression/TimeValue.java
@@ -23,8 +23,6 @@
 
 import java.sql.Time;
 
-
-
 /**
  * A Time in the form {t 'hh:mm:ss'}
  */
@@ -32,14 +30,13 @@ public class TimeValue implements Expression {
 	private Time value;
 
 	public TimeValue(String value) {
-		this.value = Time.valueOf(value.substring(1, value.length()-1));
+		this.value = Time.valueOf(value.substring(1, value.length() - 1));
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public Time getValue() {
 		return value;
 	}
@@ -49,7 +46,7 @@ public void setValue(Time d) {
 	}
 
 	public String toString() {
-		return "{t '"+value+"'}";
+		return "{t '" + value + "'}";
 	}
 
 }
diff --git a/src/net/sf/jsqlparser/expression/TimestampValue.java b/src/net/sf/jsqlparser/expression/TimestampValue.java
index f8819a249..e33098e3f 100644
--- a/src/net/sf/jsqlparser/expression/TimestampValue.java
+++ b/src/net/sf/jsqlparser/expression/TimestampValue.java
@@ -23,8 +23,6 @@
 
 import java.sql.Timestamp;
 
-
-
 /**
  * A Timestamp in the form {ts 'yyyy-mm-dd hh:mm:ss.f . . .'}
  */
@@ -32,14 +30,13 @@ public class TimestampValue implements Expression {
 	private Timestamp value;
 
 	public TimestampValue(String value) {
-		this.value = Timestamp.valueOf(value.substring(1, value.length()-1));
+		this.value = Timestamp.valueOf(value.substring(1, value.length() - 1));
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public Timestamp getValue() {
 		return value;
 	}
@@ -49,6 +46,6 @@ public void setValue(Timestamp d) {
 	}
 
 	public String toString() {
-		return "{ts '"+value+"'}";
+		return "{ts '" + value + "'}";
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/WhenClause.java b/src/net/sf/jsqlparser/expression/WhenClause.java
index 780742d42..a3968abf7 100644
--- a/src/net/sf/jsqlparser/expression/WhenClause.java
+++ b/src/net/sf/jsqlparser/expression/WhenClause.java
@@ -23,9 +23,7 @@
 package net.sf.jsqlparser.expression;
 
 /**
- * A clause of following syntax: 
- * WHEN condition THEN expression.
- * Which is part of a CaseExpression.
+ * A clause of following syntax: WHEN condition THEN expression. Which is part of a CaseExpression.
  * 
  * @author Havard Rast Blok
  */
@@ -33,8 +31,10 @@ public class WhenClause implements Expression {
 
 	private Expression whenExpression;
 	private Expression thenExpression;
-	
-	/* (non-Javadoc)
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.sf.jsqlparser.expression.Expression#accept(net.sf.jsqlparser.expression.ExpressionVisitor)
 	 */
 	public void accept(ExpressionVisitor expressionVisitor) {
@@ -47,26 +47,31 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	public Expression getThenExpression() {
 		return thenExpression;
 	}
+
 	/**
-	 * @param thenExpression The thenExpression to set.
+	 * @param thenExpression
+	 *            The thenExpression to set.
 	 */
 	public void setThenExpression(Expression thenExpression) {
 		this.thenExpression = thenExpression;
 	}
+
 	/**
 	 * @return Returns the whenExpression.
 	 */
 	public Expression getWhenExpression() {
 		return whenExpression;
 	}
+
 	/**
-	 * @param whenExpression The whenExpression to set.
+	 * @param whenExpression
+	 *            The whenExpression to set.
 	 */
 	public void setWhenExpression(Expression whenExpression) {
 		this.whenExpression = whenExpression;
 	}
-	
+
 	public String toString() {
-		return "WHEN "+whenExpression+" THEN "+thenExpression;
+		return "WHEN " + whenExpression + " THEN " + thenExpression;
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/Addition.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/Addition.java
index 0adda784b..c9899825c 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/Addition.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/Addition.java
@@ -19,18 +19,17 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class Addition extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "+";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseAnd.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseAnd.java
index 609eaa5bd..d97584453 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseAnd.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseAnd.java
@@ -19,19 +19,18 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class BitwiseAnd extends BinaryExpression {
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "&";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseOr.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseOr.java
index e2a20431a..57efb0be7 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseOr.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseOr.java
@@ -19,19 +19,18 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class BitwiseOr extends BinaryExpression {
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "|";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseXor.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseXor.java
index a0a0b4b3d..d98e20bac 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseXor.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/BitwiseXor.java
@@ -19,19 +19,18 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class BitwiseXor extends BinaryExpression {
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "^";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/Concat.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/Concat.java
index bb2ccfa65..174209f0b 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/Concat.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/Concat.java
@@ -8,7 +8,7 @@ public class Concat extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "||";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/Division.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/Division.java
index f5a3b3e8e..85ccd5f16 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/Division.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/Division.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
@@ -29,7 +29,7 @@ public class Division extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "/";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/Multiplication.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/Multiplication.java
index 983cc7383..9b8ddac50 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/Multiplication.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/Multiplication.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
diff --git a/src/net/sf/jsqlparser/expression/operators/arithmetic/Subtraction.java b/src/net/sf/jsqlparser/expression/operators/arithmetic/Subtraction.java
index 4f6bf4537..1e803d6bc 100644
--- a/src/net/sf/jsqlparser/expression/operators/arithmetic/Subtraction.java
+++ b/src/net/sf/jsqlparser/expression/operators/arithmetic/Subtraction.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.arithmetic;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
@@ -30,7 +30,7 @@ public class Subtraction extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "-";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/conditional/AndExpression.java b/src/net/sf/jsqlparser/expression/operators/conditional/AndExpression.java
index 2eb18dd20..3d2853f74 100644
--- a/src/net/sf/jsqlparser/expression/operators/conditional/AndExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/conditional/AndExpression.java
@@ -19,23 +19,23 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.conditional;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class AndExpression extends BinaryExpression {
 	public AndExpression(Expression leftExpression, Expression rightExpression) {
 		setLeftExpression(leftExpression);
 		setRightExpression(rightExpression);
 	}
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "AND";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/conditional/OrExpression.java b/src/net/sf/jsqlparser/expression/operators/conditional/OrExpression.java
index e5e3ba592..3db56beca 100644
--- a/src/net/sf/jsqlparser/expression/operators/conditional/OrExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/conditional/OrExpression.java
@@ -19,19 +19,19 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.conditional;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class OrExpression extends BinaryExpression {
 	public OrExpression(Expression leftExpression, Expression rightExpression) {
 		setLeftExpression(leftExpression);
 		setRightExpression(rightExpression);
 	}
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/Between.java b/src/net/sf/jsqlparser/expression/operators/relational/Between.java
index 06bb7f7ca..b74ccc0b7 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/Between.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/Between.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 /**
  * A "BETWEEN" expr1 expr2 statement
  */
@@ -72,7 +71,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	}
 
 	public String toString() {
-		return leftExpression + " " + (not?"NOT ":"") + "BETWEEN "+
-		betweenExpressionStart+" AND "+betweenExpressionEnd;
+		return leftExpression + " " + (not ? "NOT " : "") + "BETWEEN " + betweenExpressionStart + " AND "
+				+ betweenExpressionEnd;
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java b/src/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java
index bbf801e92..49c9b943a 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
@@ -29,7 +29,7 @@ public class EqualsTo extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String getStringExpression() {
 		return "=";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java b/src/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java
index 29c5dd726..d4f8d2601 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class ExistsExpression implements Expression {
 	private Expression rightExpression;
 	private boolean not = false;
@@ -51,7 +50,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	}
 
 	public String getStringExpression() {
-		return ((not)?"NOT ":"")+"EXISTS";
+		return ((not) ? "NOT " : "") + "EXISTS";
 	}
 
 	public String toString() {
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java b/src/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java
index ce1223e37..02e9744f3 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java
@@ -19,8 +19,8 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
- package net.sf.jsqlparser.expression.operators.relational;
+
+package net.sf.jsqlparser.expression.operators.relational;
 
 import java.util.List;
 
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/GreaterThan.java b/src/net/sf/jsqlparser/expression/operators/relational/GreaterThan.java
index b8bd8b59c..8187fdbe2 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/GreaterThan.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/GreaterThan.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class GreaterThan extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/GreaterThanEquals.java b/src/net/sf/jsqlparser/expression/operators/relational/GreaterThanEquals.java
index 8d857ad3a..05bc072e2 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/GreaterThanEquals.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/GreaterThanEquals.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class GreaterThanEquals extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/InExpression.java b/src/net/sf/jsqlparser/expression/operators/relational/InExpression.java
index 8645c6213..e1a912829 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/InExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/InExpression.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import java.awt.event.ItemListener;
@@ -27,13 +27,11 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
-
 public class InExpression implements Expression {
 	private Expression leftExpression;
-	private ItemsList itemsList; 
+	private ItemsList itemsList;
 	private boolean not = false;
-	
+
 	public InExpression() {
 	}
 
@@ -41,7 +39,7 @@ public InExpression(Expression leftExpression, ItemsList itemsList) {
 		setLeftExpression(leftExpression);
 		setItemsList(itemsList);
 	}
-	
+
 	public ItemsList getItemsList() {
 		return itemsList;
 	}
@@ -71,6 +69,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	}
 
 	public String toString() {
-		return leftExpression + " "+((not)?"NOT ":"")+"IN "+ itemsList+"";
+		return leftExpression + " " + ((not) ? "NOT " : "") + "IN " + itemsList + "";
 	}
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java b/src/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java
index f6fc8a0e5..844b8416a 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class IsNullExpression implements Expression {
 	private Expression leftExpression;
 	private boolean not = false;
@@ -49,9 +48,9 @@ public void setNot(boolean b) {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
-	
+
 	public String toString() {
-        return leftExpression + " IS "+((not)?"NOT ":"")+"NULL";
-    }
+		return leftExpression + " IS " + ((not) ? "NOT " : "") + "NULL";
+	}
 
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java b/src/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java
index 496f71eba..4c5ae1bf4 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java
@@ -19,12 +19,13 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.statement.select.SubSelect;
 
 public interface ItemsListVisitor {
 	public void visit(SubSelect subSelect);
+
 	public void visit(ExpressionList expressionList);
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java b/src/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java
index 34e3945f3..4ed0ac617 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class LikeExpression extends BinaryExpression {
 	private boolean not = false;
 	private String escape = null;
@@ -42,26 +41,24 @@ public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public String getStringExpression() {
-		return ((not)?"NOT ":"")+"LIKE";
+		return ((not) ? "NOT " : "") + "LIKE";
 	}
-	
 
 	public String toString() {
-	    String retval = super.toString();
-	    if (escape != null) {
-	        retval += " ESCAPE " + "'" + escape + "'";
-	    }
-	    
-	    return retval;
+		String retval = super.toString();
+		if (escape != null) {
+			retval += " ESCAPE " + "'" + escape + "'";
+		}
+
+		return retval;
 	}
 
 	public String getEscape() {
-        return escape;
-    }
-    
-    public void setEscape(String escape) {
-        this.escape = escape;
-    }
+		return escape;
+	}
+
+	public void setEscape(String escape) {
+		this.escape = escape;
+	}
 }
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/MinorThan.java b/src/net/sf/jsqlparser/expression/operators/relational/MinorThan.java
index 5b8234fca..6d7768cde 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/MinorThan.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/MinorThan.java
@@ -19,13 +19,12 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class MinorThan extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/MinorThanEquals.java b/src/net/sf/jsqlparser/expression/operators/relational/MinorThanEquals.java
index 699c0be13..d7cc20305 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/MinorThanEquals.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/MinorThanEquals.java
@@ -19,19 +19,17 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class MinorThanEquals extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public String getStringExpression() {
 		return "<=";
 	}
diff --git a/src/net/sf/jsqlparser/expression/operators/relational/NotEqualsTo.java b/src/net/sf/jsqlparser/expression/operators/relational/NotEqualsTo.java
index b19fa1753..ecc36e563 100644
--- a/src/net/sf/jsqlparser/expression/operators/relational/NotEqualsTo.java
+++ b/src/net/sf/jsqlparser/expression/operators/relational/NotEqualsTo.java
@@ -19,19 +19,17 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-
 public class NotEqualsTo extends BinaryExpression {
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-
 	public String getStringExpression() {
 		return "<>";
 	}
diff --git a/src/net/sf/jsqlparser/parser/CCJSqlParserManager.java b/src/net/sf/jsqlparser/parser/CCJSqlParserManager.java
index 47518ec7b..3ddc7a6fd 100644
--- a/src/net/sf/jsqlparser/parser/CCJSqlParserManager.java
+++ b/src/net/sf/jsqlparser/parser/CCJSqlParserManager.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.parser;
 
 import java.io.Reader;
@@ -41,5 +41,4 @@ public Statement parse(Reader statementReader) throws JSQLParserException {
 		}
 	}
 
-
 }
diff --git a/src/net/sf/jsqlparser/schema/Column.java b/src/net/sf/jsqlparser/schema/Column.java
index 4ec58f073..55563d36e 100644
--- a/src/net/sf/jsqlparser/schema/Column.java
+++ b/src/net/sf/jsqlparser/schema/Column.java
@@ -20,19 +20,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 package net.sf.jsqlparser.schema;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
 /**
- * A column. It can have the table name it belongs to. 
+ * A column. It can have the table name it belongs to.
  */
 public class Column implements Expression {
 	private String columnName = "";
 	private Table table;
-	
+
 	public Column() {
 	}
 
@@ -40,7 +39,7 @@ public Column(Table table, String columnName) {
 		this.table = table;
 		this.columnName = columnName;
 	}
-	
+
 	public String getColumnName() {
 		return columnName;
 	}
@@ -56,25 +55,25 @@ public void setColumnName(String string) {
 	public void setTable(Table table) {
 		this.table = table;
 	}
-	
+
 	/**
-	 * @return the name of the column, prefixed with 'tableName' and '.' 
+	 * @return the name of the column, prefixed with 'tableName' and '.'
 	 */
 	public String getWholeColumnName() {
-		
+
 		String columnWholeName = null;
 		String tableWholeName = table.getWholeTableName();
-		
+
 		if (tableWholeName != null && tableWholeName.length() != 0) {
 			columnWholeName = tableWholeName + "." + columnName;
 		} else {
 			columnWholeName = columnName;
 		}
-		
+
 		return columnWholeName;
 
 	}
-	
+
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
diff --git a/src/net/sf/jsqlparser/schema/Table.java b/src/net/sf/jsqlparser/schema/Table.java
index 31fb5ba25..fcb9ab854 100644
--- a/src/net/sf/jsqlparser/schema/Table.java
+++ b/src/net/sf/jsqlparser/schema/Table.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.schema;
 
 import net.sf.jsqlparser.statement.select.FromItem;
@@ -28,13 +28,13 @@
 import net.sf.jsqlparser.statement.select.SelectItemVisitor;
 
 /**
- * A table. It can have an alias and the schema name it belongs to. 
+ * A table. It can have an alias and the schema name it belongs to.
  */
 public class Table implements FromItem {
 	private String schemaName;
 	private String name;
 	private String alias;
-	
+
 	public Table() {
 	}
 
@@ -42,7 +42,7 @@ public Table(String schemaName, String name) {
 		this.schemaName = schemaName;
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
@@ -66,7 +66,7 @@ public String getAlias() {
 	public void setAlias(String string) {
 		alias = string;
 	}
-	
+
 	public String getWholeTableName() {
 
 		String tableWholeName = null;
@@ -78,7 +78,7 @@ public String getWholeTableName() {
 		} else {
 			tableWholeName = name;
 		}
-		
+
 		return tableWholeName;
 
 	}
@@ -86,13 +86,12 @@ public String getWholeTableName() {
 	public void accept(FromItemVisitor fromItemVisitor) {
 		fromItemVisitor.visit(this);
 	}
-	
+
 	public void accept(IntoTableVisitor intoTableVisitor) {
 		intoTableVisitor.visit(this);
 	}
-	
-	
+
 	public String toString() {
-		return getWholeTableName()+((alias!=null)?" AS "+alias:"");
+		return getWholeTableName() + ((alias != null) ? " AS " + alias : "");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/Statement.java b/src/net/sf/jsqlparser/statement/Statement.java
index 670bf5520..f22d28152 100644
--- a/src/net/sf/jsqlparser/statement/Statement.java
+++ b/src/net/sf/jsqlparser/statement/Statement.java
@@ -19,12 +19,11 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
-package net.sf.jsqlparser.statement;
 
+package net.sf.jsqlparser.statement;
 
 /**
- * An operation on the db (SELECT, UPDATE ecc.) 
+ * An operation on the db (SELECT, UPDATE ecc.)
  */
 public interface Statement {
 	public void accept(StatementVisitor statementVisitor);
diff --git a/src/net/sf/jsqlparser/statement/StatementVisitor.java b/src/net/sf/jsqlparser/statement/StatementVisitor.java
index cc06acd75..5f692a76f 100644
--- a/src/net/sf/jsqlparser/statement/StatementVisitor.java
+++ b/src/net/sf/jsqlparser/statement/StatementVisitor.java
@@ -33,12 +33,19 @@
 
 public interface StatementVisitor {
 	public void visit(Select select);
+
 	public void visit(Delete delete);
+
 	public void visit(Update update);
+
 	public void visit(Insert insert);
+
 	public void visit(Replace replace);
+
 	public void visit(Drop drop);
+
 	public void visit(Truncate truncate);
+
 	public void visit(CreateTable createTable);
 
 }
diff --git a/src/net/sf/jsqlparser/statement/create/table/ColDataType.java b/src/net/sf/jsqlparser/statement/create/table/ColDataType.java
index 3ffe21087..92fc2fbf4 100644
--- a/src/net/sf/jsqlparser/statement/create/table/ColDataType.java
+++ b/src/net/sf/jsqlparser/statement/create/table/ColDataType.java
@@ -7,26 +7,27 @@
 
 public class ColDataType {
 
-    private String dataType;
-    private List argumentsStringList;
+	private String dataType;
+	private List argumentsStringList;
 
-    public List getArgumentsStringList() {
-        return argumentsStringList;
-    }
+	public List getArgumentsStringList() {
+		return argumentsStringList;
+	}
 
-    public String getDataType() {
-        return dataType;
-    }
+	public String getDataType() {
+		return dataType;
+	}
 
-    public void setArgumentsStringList(List list) {
-        argumentsStringList = list;
-    }
+	public void setArgumentsStringList(List list) {
+		argumentsStringList = list;
+	}
 
-    public void setDataType(String string) {
-        dataType = string;
-    }
+	public void setDataType(String string) {
+		dataType = string;
+	}
 
-    public String toString() {
-        return dataType + (argumentsStringList!=null?" "+PlainSelect.getStringList(argumentsStringList, true, true):"");
-    }
+	public String toString() {
+		return dataType
+				+ (argumentsStringList != null ? " " + PlainSelect.getStringList(argumentsStringList, true, true) : "");
+	}
 }
\ No newline at end of file
diff --git a/src/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java b/src/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java
index 835b216c6..bccc82a85 100644
--- a/src/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java
+++ b/src/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java
@@ -12,7 +12,7 @@ public class ColumnDefinition {
 	private String columnName;
 	private ColDataType colDataType;
 	private List columnSpecStrings;
-	
+
 	/**
 	 * A list of strings of every word after the datatype of the column.

 	 * Example ("NOT", "NULL")
@@ -26,7 +26,7 @@ public void setColumnSpecStrings(List list) {
 	}
 
 	/**
-	 * The {@link ColDataType} of this column definition 
+	 * The {@link ColDataType} of this column definition
 	 */
 	public ColDataType getColDataType() {
 		return colDataType;
@@ -43,9 +43,9 @@ public String getColumnName() {
 	public void setColumnName(String string) {
 		columnName = string;
 	}
-	
+
 	public String toString() {
-		return columnName+" "+colDataType+" "+PlainSelect.getStringList(columnSpecStrings, false, false);
+		return columnName + " " + colDataType + " " + PlainSelect.getStringList(columnSpecStrings, false, false);
 	}
 
 }
diff --git a/src/net/sf/jsqlparser/statement/create/table/CreateTable.java b/src/net/sf/jsqlparser/statement/create/table/CreateTable.java
index 17f521356..2113d36b4 100644
--- a/src/net/sf/jsqlparser/statement/create/table/CreateTable.java
+++ b/src/net/sf/jsqlparser/statement/create/table/CreateTable.java
@@ -12,73 +12,73 @@
  */
 public class CreateTable implements Statement {
 
-    private Table table;
-    private List tableOptionsStrings;
-    private List columnDefinitions;
-    private List indexes;
-
-    public void accept(StatementVisitor statementVisitor) {
-        statementVisitor.visit(this);
-    }
-
-    /**
-     * The name of the table to be created
-     */
-    public Table getTable() {
-        return table;
-    }
-
-    public void setTable(Table table) {
-        this.table = table;
-    }
-
-    /**
-     * A list of {@link ColumnDefinition}s of this table.
-     */
-    public List getColumnDefinitions() {
-        return columnDefinitions;
-    }
-
-    public void setColumnDefinitions(List list) {
-        columnDefinitions = list;
-    }
-
-    /**
-     * A list of options (as simple strings) of this table definition, as ("TYPE", "=", "MYISAM") 
-     */
-    public List getTableOptionsStrings() {
-        return tableOptionsStrings;
-    }
-
-    public void setTableOptionsStrings(List list) {
-        tableOptionsStrings = list;
-    }
-
-    /**
-     * A list of {@link Index}es (for example "PRIMARY KEY") of this table.

-     * Indexes created with column definitions (as in mycol INT PRIMARY KEY) are not inserted into this list.  
-     */
-    public List getIndexes() {
-        return indexes;
-    }
-
-    public void setIndexes(List list) {
-        indexes = list;
-    }
-
-    public String toString() {
-        String sql = "";
-
-        sql = "CREATE TABLE " + table + " (";
-
-        sql += PlainSelect.getStringList(columnDefinitions, true, false);
-        if (indexes != null && indexes.size() != 0) {
-            sql += ", ";
-            sql += PlainSelect.getStringList(indexes);
-        }
-        sql += ") ";
-        sql += PlainSelect.getStringList(tableOptionsStrings, false, false);
-
-        return sql;
-    }
+	private Table table;
+	private List tableOptionsStrings;
+	private List columnDefinitions;
+	private List indexes;
+
+	public void accept(StatementVisitor statementVisitor) {
+		statementVisitor.visit(this);
+	}
+
+	/**
+	 * The name of the table to be created
+	 */
+	public Table getTable() {
+		return table;
+	}
+
+	public void setTable(Table table) {
+		this.table = table;
+	}
+
+	/**
+	 * A list of {@link ColumnDefinition}s of this table.
+	 */
+	public List getColumnDefinitions() {
+		return columnDefinitions;
+	}
+
+	public void setColumnDefinitions(List list) {
+		columnDefinitions = list;
+	}
+
+	/**
+	 * A list of options (as simple strings) of this table definition, as ("TYPE", "=", "MYISAM")
+	 */
+	public List getTableOptionsStrings() {
+		return tableOptionsStrings;
+	}
+
+	public void setTableOptionsStrings(List list) {
+		tableOptionsStrings = list;
+	}
+
+	/**
+	 * A list of {@link Index}es (for example "PRIMARY KEY") of this table.

+	 * Indexes created with column definitions (as in mycol INT PRIMARY KEY) are not inserted into this list.
+	 */
+	public List getIndexes() {
+		return indexes;
+	}
+
+	public void setIndexes(List list) {
+		indexes = list;
+	}
+
+	public String toString() {
+		String sql = "";
+
+		sql = "CREATE TABLE " + table + " (";
+
+		sql += PlainSelect.getStringList(columnDefinitions, true, false);
+		if (indexes != null && indexes.size() != 0) {
+			sql += ", ";
+			sql += PlainSelect.getStringList(indexes);
+		}
+		sql += ") ";
+		sql += PlainSelect.getStringList(tableOptionsStrings, false, false);
+
+		return sql;
+	}
 }
\ No newline at end of file
diff --git a/src/net/sf/jsqlparser/statement/create/table/Index.java b/src/net/sf/jsqlparser/statement/create/table/Index.java
index 1dd1bbda9..604004eb9 100644
--- a/src/net/sf/jsqlparser/statement/create/table/Index.java
+++ b/src/net/sf/jsqlparser/statement/create/table/Index.java
@@ -5,45 +5,45 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /**
- * An index (unique, primary etc.) in a CREATE TABLE statement 
+ * An index (unique, primary etc.) in a CREATE TABLE statement
  */
 public class Index {
 
-    private String type;
-    private List columnsNames;
-    private String name;
-
-    /**
-     * A list of strings of all the columns regarding this index  
-     */
-    public List getColumnsNames() {
-        return columnsNames;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * The type of this index: "PRIMARY KEY", "UNIQUE", "INDEX"
-     */
-    public String getType() {
-        return type;
-    }
-
-    public void setColumnsNames(List list) {
-        columnsNames = list;
-    }
-
-    public void setName(String string) {
-        name = string;
-    }
-
-    public void setType(String string) {
-        type = string;
-    }
-
-    public String toString() {
-        return type + " " + PlainSelect.getStringList(columnsNames, true, true) + (name!=null?" "+name:"");
-    }
+	private String type;
+	private List columnsNames;
+	private String name;
+
+	/**
+	 * A list of strings of all the columns regarding this index
+	 */
+	public List getColumnsNames() {
+		return columnsNames;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * The type of this index: "PRIMARY KEY", "UNIQUE", "INDEX"
+	 */
+	public String getType() {
+		return type;
+	}
+
+	public void setColumnsNames(List list) {
+		columnsNames = list;
+	}
+
+	public void setName(String string) {
+		name = string;
+	}
+
+	public void setType(String string) {
+		type = string;
+	}
+
+	public String toString() {
+		return type + " " + PlainSelect.getStringList(columnsNames, true, true) + (name != null ? " " + name : "");
+	}
 }
\ No newline at end of file
diff --git a/src/net/sf/jsqlparser/statement/delete/Delete.java b/src/net/sf/jsqlparser/statement/delete/Delete.java
index d7124f970..8986dc5a3 100644
--- a/src/net/sf/jsqlparser/statement/delete/Delete.java
+++ b/src/net/sf/jsqlparser/statement/delete/Delete.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.delete;
 
 import net.sf.jsqlparser.expression.Expression;
@@ -30,7 +30,7 @@
 public class Delete implements Statement {
 	private Table table;
 	private Expression where;
-	
+
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
 	}
@@ -52,6 +52,6 @@ public void setWhere(Expression expression) {
 	}
 
 	public String toString() {
-		return "DELETE FROM "+table+((where!=null)?" WHERE "+where:"");
+		return "DELETE FROM " + table + ((where != null) ? " WHERE " + where : "");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/drop/Drop.java b/src/net/sf/jsqlparser/statement/drop/Drop.java
index e1b8542bf..11d32d545 100644
--- a/src/net/sf/jsqlparser/statement/drop/Drop.java
+++ b/src/net/sf/jsqlparser/statement/drop/Drop.java
@@ -10,7 +10,7 @@ public class Drop implements Statement {
 	private String type;
 	private String name;
 	private List parameters;
-	
+
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
 	}
@@ -40,12 +40,12 @@ public void setType(String string) {
 	}
 
 	public String toString() {
-		String sql = "DROP "+type+" "+name;
-		
-		if( parameters != null && parameters.size() > 0) {
-			sql += " "+PlainSelect.getStringList(parameters);
+		String sql = "DROP " + type + " " + name;
+
+		if (parameters != null && parameters.size() > 0) {
+			sql += " " + PlainSelect.getStringList(parameters);
 		}
-		
+
 		return sql;
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/insert/Insert.java b/src/net/sf/jsqlparser/statement/insert/Insert.java
index 7f6ba951f..d58784067 100644
--- a/src/net/sf/jsqlparser/statement/insert/Insert.java
+++ b/src/net/sf/jsqlparser/statement/insert/Insert.java
@@ -30,17 +30,15 @@
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-
 /**
- * The insert statement.
- * Every column name in columnNames matches an item in itemsList
+ * The insert statement. Every column name in columnNames matches an item in itemsList
  */
 public class Insert implements Statement {
 	private Table table;
 	private List columns;
 	private ItemsList itemsList;
 	private boolean useValues = true;
-	
+
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
 	}
@@ -55,6 +53,7 @@ public void setTable(Table name) {
 
 	/**
 	 * Get the columns (found in "INSERT INTO (col1,col2..) [...]" )
+	 * 
 	 * @return a list of {@link net.sf.jsqlparser.schema.Column}
 	 */
 	public List getColumns() {
@@ -66,7 +65,8 @@ public void setColumns(List list) {
 	}
 
 	/**
-	 * Get the values (as VALUES (...) or SELECT) 
+	 * Get the values (as VALUES (...) or SELECT)
+	 * 
 	 * @return the values of the insert
 	 */
 	public ItemsList getItemsList() {
@@ -77,27 +77,27 @@ public void setItemsList(ItemsList list) {
 		itemsList = list;
 	}
 
-    public boolean isUseValues() {
-        return useValues;
-    }
-    
-    public void setUseValues(boolean useValues) {
-        this.useValues = useValues;
-    }
-    
+	public boolean isUseValues() {
+		return useValues;
+	}
+
+	public void setUseValues(boolean useValues) {
+		this.useValues = useValues;
+	}
+
 	public String toString() {
 		String sql = "";
 
 		sql = "INSERT INTO ";
-		sql += table+" ";
-		sql += ((columns!=null)?PlainSelect.getStringList(columns, true, true)+" ":"");
-		
-		if(useValues) {
-			sql += "VALUES "+itemsList+"";
+		sql += table + " ";
+		sql += ((columns != null) ? PlainSelect.getStringList(columns, true, true) + " " : "");
+
+		if (useValues) {
+			sql += "VALUES " + itemsList + "";
 		} else {
-			sql += ""+itemsList+"";
+			sql += "" + itemsList + "";
 		}
-		
+
 		return sql;
 	}
 
diff --git a/src/net/sf/jsqlparser/statement/replace/Replace.java b/src/net/sf/jsqlparser/statement/replace/Replace.java
index f2475f36d..2e08722e1 100644
--- a/src/net/sf/jsqlparser/statement/replace/Replace.java
+++ b/src/net/sf/jsqlparser/statement/replace/Replace.java
@@ -54,23 +54,23 @@ public void setTable(Table name) {
 	}
 
 	/**
-	 * A list of {@link net.sf.jsqlparser.schema.Column}s either from a "REPLACE mytab (col1, col2) [...]" or a "REPLACE mytab SET col1=exp1, col2=exp2". 
+	 * A list of {@link net.sf.jsqlparser.schema.Column}s either from a "REPLACE mytab (col1, col2) [...]" or a
+	 * "REPLACE mytab SET col1=exp1, col2=exp2".
+	 * 
 	 * @return a list of {@link net.sf.jsqlparser.schema.Column}s
 	 */
 	public List getColumns() {
 		return columns;
 	}
 
-
 	/**
-	 * An {@link ItemsList} (either from a "REPLACE mytab VALUES (exp1,exp2)" or a "REPLACE mytab SELECT * FROM mytab2")  
-	 * it is null in case of a "REPLACE mytab SET col1=exp1, col2=exp2"  
+	 * An {@link ItemsList} (either from a "REPLACE mytab VALUES (exp1,exp2)" or a "REPLACE mytab SELECT * FROM mytab2")
+	 * it is null in case of a "REPLACE mytab SET col1=exp1, col2=exp2"
 	 */
 	public ItemsList getItemsList() {
 		return itemsList;
 	}
 
-
 	public void setColumns(List list) {
 		columns = list;
 	}
@@ -81,7 +81,7 @@ public void setItemsList(ItemsList list) {
 
 	/**
 	 * A list of {@link net.sf.jsqlparser.expression.Expression}s (from a "REPLACE mytab SET col1=exp1, col2=exp2"). 

-	 * it is null in case of a "REPLACE mytab (col1, col2) [...]"  
+	 * it is null in case of a "REPLACE mytab (col1, col2) [...]"
 	 */
 	public List getExpressions() {
 		return expressions;
@@ -92,41 +92,40 @@ public void setExpressions(List list) {
 	}
 
 	public boolean isUseValues() {
-        return useValues;
-    }
-    
+		return useValues;
+	}
+
 	public void setUseValues(boolean useValues) {
-        this.useValues = useValues;
-    }
-	
+		this.useValues = useValues;
+	}
+
 	public String toString() {
-		String sql = "REPLACE "+table;
-		
-		if(expressions != null && columns != null ) {
-			//the SET col1=exp1, col2=exp2 case
+		String sql = "REPLACE " + table;
+
+		if (expressions != null && columns != null) {
+			// the SET col1=exp1, col2=exp2 case
 			sql += " SET ";
-			//each element from expressions match up with a column from columns.
+			// each element from expressions match up with a column from columns.
 			for (int i = 0, s = columns.size(); i < s; i++) {
-				sql += ""+columns.get(i)+"="+expressions.get(i);
-				sql += (i 0) {
-			sql += " ON ("+PlainSelect.getStringList(onSelectItems)+")";
+
+		if (onSelectItems != null && onSelectItems.size() > 0) {
+			sql += " ON (" + PlainSelect.getStringList(onSelectItems) + ")";
 		}
-		
+
 		return sql;
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/FromItem.java b/src/net/sf/jsqlparser/statement/select/FromItem.java
index 3993b7439..d2873fa62 100644
--- a/src/net/sf/jsqlparser/statement/select/FromItem.java
+++ b/src/net/sf/jsqlparser/statement/select/FromItem.java
@@ -23,12 +23,13 @@
 package net.sf.jsqlparser.statement.select;
 
 /**
- * An item in a "SELECT [...] FROM item1" statement.
- * (for example a table or a sub-select) 
+ * An item in a "SELECT [...] FROM item1" statement. (for example a table or a sub-select)
  */
 public interface FromItem {
 	public void accept(FromItemVisitor fromItemVisitor);
+
 	public String getAlias();
+
 	public void setAlias(String alias);
-	
+
 }
diff --git a/src/net/sf/jsqlparser/statement/select/FromItemVisitor.java b/src/net/sf/jsqlparser/statement/select/FromItemVisitor.java
index 0f8b5b8f8..816c31fb8 100644
--- a/src/net/sf/jsqlparser/statement/select/FromItemVisitor.java
+++ b/src/net/sf/jsqlparser/statement/select/FromItemVisitor.java
@@ -24,7 +24,9 @@
 import net.sf.jsqlparser.schema.Table;
 
 public interface FromItemVisitor {
-	public void visit(Table tableName); 
+	public void visit(Table tableName);
+
 	public void visit(SubSelect subSelect);
-	public void visit(SubJoin subjoin); 
+
+	public void visit(SubJoin subjoin);
 }
diff --git a/src/net/sf/jsqlparser/statement/select/Join.java b/src/net/sf/jsqlparser/statement/select/Join.java
index 865a227fc..6ccba65af 100644
--- a/src/net/sf/jsqlparser/statement/select/Join.java
+++ b/src/net/sf/jsqlparser/statement/select/Join.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 import java.util.List;
@@ -39,10 +39,11 @@ public class Join {
 	private boolean simple = false;
 	private FromItem rightItem;
 	private Expression onExpression;
-	private List usingColumns; 
+	private List usingColumns;
 
 	/**
 	 * Whether is a tab1,tab2 join
+	 * 
 	 * @return true if is a "tab1,tab2" join
 	 */
 	public boolean isSimple() {
@@ -52,8 +53,10 @@ public boolean isSimple() {
 	public void setSimple(boolean b) {
 		simple = b;
 	}
+
 	/**
 	 * Whether is a "INNER" join
+	 * 
 	 * @return true if is a "INNER" join
 	 */
 	public boolean isInner() {
@@ -63,9 +66,10 @@ public boolean isInner() {
 	public void setInner(boolean b) {
 		inner = b;
 	}
-	
+
 	/**
 	 * Whether is a "OUTER" join
+	 * 
 	 * @return true if is a "OUTER" join
 	 */
 	public boolean isOuter() {
@@ -78,6 +82,7 @@ public void setOuter(boolean b) {
 
 	/**
 	 * Whether is a "LEFT" join
+	 * 
 	 * @return true if is a "LEFT" join
 	 */
 	public boolean isLeft() {
@@ -90,6 +95,7 @@ public void setLeft(boolean b) {
 
 	/**
 	 * Whether is a "RIGHT" join
+	 * 
 	 * @return true if is a "RIGHT" join
 	 */
 	public boolean isRight() {
@@ -102,6 +108,7 @@ public void setRight(boolean b) {
 
 	/**
 	 * Whether is a "NATURAL" join
+	 * 
 	 * @return true if is a "NATURAL" join
 	 */
 	public boolean isNatural() {
@@ -114,6 +121,7 @@ public void setNatural(boolean b) {
 
 	/**
 	 * Whether is a "FULL" join
+	 * 
 	 * @return true if is a "FULL" join
 	 */
 	public boolean isFull() {
@@ -160,10 +168,9 @@ public void setUsingColumns(List list) {
 	public String toString() {
 		if (isSimple())
 			return "" + rightItem;
-		else
-		{
+		else {
 			String type = "";
-	
+
 			if (isRight())
 				type += "RIGHT ";
 			else if (isNatural())
@@ -172,17 +179,15 @@ else if (isFull())
 				type += "FULL ";
 			else if (isLeft())
 				type += "LEFT ";
-			
+
 			if (isOuter())
 				type += "OUTER ";
 			else if (isInner())
 				type += "INNER ";
 
-			return type +"JOIN " +
-			rightItem+
-			((onExpression!=null)?" ON "+onExpression+"":"")+
-			PlainSelect.getFormatedList(usingColumns, "USING", true, true);
+			return type + "JOIN " + rightItem + ((onExpression != null) ? " ON " + onExpression + "" : "")
+					+ PlainSelect.getFormatedList(usingColumns, "USING", true, true);
 		}
-		
+
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/Limit.java b/src/net/sf/jsqlparser/statement/select/Limit.java
index 0f4a085a1..4820598a2 100644
--- a/src/net/sf/jsqlparser/statement/select/Limit.java
+++ b/src/net/sf/jsqlparser/statement/select/Limit.java
@@ -5,11 +5,11 @@
  */
 public class Limit {
 	private long offset;
-	private long rowCount ;
+	private long rowCount;
 	private boolean rowCountJdbcParameter = false;
 	private boolean offsetJdbcParameter = false;
 	private boolean limitAll;
-	
+
 	public long getOffset() {
 		return offset;
 	}
@@ -42,7 +42,6 @@ public void setRowCountJdbcParameter(boolean b) {
 		rowCountJdbcParameter = b;
 	}
 
-
 	/**
 	 * @return true if the limit is "LIMIT ALL [OFFSET ...])
 	 */
@@ -55,13 +54,13 @@ public void setLimitAll(boolean b) {
 	}
 
 	public String toString() {
-	    String retVal = "";
-	    if (rowCount > 0 || rowCountJdbcParameter ) {
-	        retVal += " LIMIT "+(rowCountJdbcParameter?"?":rowCount+"");
-	    }
-	    if (offset > 0 || offsetJdbcParameter) {
-	        retVal += " OFFSET "+(offsetJdbcParameter?"?":offset+"");
-	    }
-	    return retVal;
+		String retVal = "";
+		if (rowCount > 0 || rowCountJdbcParameter) {
+			retVal += " LIMIT " + (rowCountJdbcParameter ? "?" : rowCount + "");
+		}
+		if (offset > 0 || offsetJdbcParameter) {
+			retVal += " OFFSET " + (offsetJdbcParameter ? "?" : offset + "");
+		}
+		return retVal;
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/OrderByElement.java b/src/net/sf/jsqlparser/statement/select/OrderByElement.java
index 80c94d49f..a5073dcb9 100644
--- a/src/net/sf/jsqlparser/statement/select/OrderByElement.java
+++ b/src/net/sf/jsqlparser/statement/select/OrderByElement.java
@@ -19,19 +19,17 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.expression.Expression;
 
-
 /**
  * An element (column reference) in an "ORDER BY" clause.
  */
 public class OrderByElement {
 	private Expression expression;
-	private boolean asc = true; 
-	
+	private boolean asc = true;
 
 	public boolean isAsc() {
 		return asc;
@@ -41,8 +39,7 @@ public void setAsc(boolean b) {
 		asc = b;
 	}
 
-
-	public void accept(OrderByVisitor orderByVisitor){
+	public void accept(OrderByVisitor orderByVisitor) {
 		orderByVisitor.visit(this);
 	}
 
@@ -55,6 +52,6 @@ public void setExpression(Expression expression) {
 	}
 
 	public String toString() {
-		return ""+expression+((asc)?"":" DESC");
+		return "" + expression + ((asc) ? "" : " DESC");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/OrderByVisitor.java b/src/net/sf/jsqlparser/statement/select/OrderByVisitor.java
index 820f5c1e7..c9ba33021 100644
--- a/src/net/sf/jsqlparser/statement/select/OrderByVisitor.java
+++ b/src/net/sf/jsqlparser/statement/select/OrderByVisitor.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 public interface OrderByVisitor {
diff --git a/src/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/net/sf/jsqlparser/statement/select/PlainSelect.java
index 1758197a6..fbc043cde 100644
--- a/src/net/sf/jsqlparser/statement/select/PlainSelect.java
+++ b/src/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 import java.util.Iterator;
@@ -31,7 +31,7 @@
 /**
  */
 /**
- * The core of a "SELECT" statement (no UNION, no ORDER BY) 
+ * The core of a "SELECT" statement (no UNION, no ORDER BY)
  */
 public class PlainSelect implements SelectBody {
 	private Distinct distinct = null;
@@ -45,11 +45,10 @@ public class PlainSelect implements SelectBody {
 	private Expression having;
 	private Limit limit;
 	private Top top;
-	
-
 
 	/**
 	 * The {@link FromItem} in this query
+	 * 
 	 * @return the {@link FromItem}
 	 */
 	public FromItem getFromItem() {
@@ -62,6 +61,7 @@ public Table getInto() {
 
 	/**
 	 * The {@link SelectItem}s in this query (for example the A,B,C in "SELECT A,B,C")
+	 * 
 	 * @return a list of {@link SelectItem}s
 	 */
 	public List getSelectItems() {
@@ -80,7 +80,6 @@ public void setInto(Table table) {
 		into = table;
 	}
 
-
 	public void setSelectItems(List list) {
 		selectItems = list;
 	}
@@ -89,9 +88,9 @@ public void setWhere(Expression where) {
 		this.where = where;
 	}
 
-	
 	/**
 	 * The list of {@link Join}s
+	 * 
 	 * @return the list of {@link Join}s
 	 */
 	public List getJoins() {
@@ -102,7 +101,7 @@ public void setJoins(List list) {
 		joins = list;
 	}
 
-	public void accept(SelectVisitor selectVisitor){
+	public void accept(SelectVisitor selectVisitor) {
 		selectVisitor.visit(this);
 	}
 
@@ -147,9 +146,9 @@ public void setHaving(Expression expression) {
 	}
 
 	/**
-	 * A list of {@link Expression}s of the GROUP BY clause.
-	 * It is null in case there is no GROUP BY clause
-	 * @return a list of {@link Expression}s 
+	 * A list of {@link Expression}s of the GROUP BY clause. It is null in case there is no GROUP BY clause
+	 * 
+	 * @return a list of {@link Expression}s
 	 */
 	public List getGroupByColumnReferences() {
 		return groupByColumnReferences;
@@ -163,62 +162,59 @@ public String toString() {
 		String sql = "";
 
 		sql = "SELECT ";
-		sql += ((distinct != null)?""+distinct+" ":"");
-		sql += ((top != null)?""+top+" ":"");
+		sql += ((distinct != null) ? "" + distinct + " " : "");
+		sql += ((top != null) ? "" + top + " " : "");
 		sql += getStringList(selectItems);
 		sql += " FROM " + fromItem;
 		if (joins != null) {
 			Iterator it = joins.iterator();
-			while(it.hasNext()) {
-				Join join = (Join)it.next();
+			while (it.hasNext()) {
+				Join join = (Join) it.next();
 				if (join.isSimple()) {
 					sql += ", " + join;
-				}
-				else {
+				} else {
 					sql += " " + join;
 				}
 			}
 		}
-		//sql += getFormatedList(joins, "", false, false);
+		// sql += getFormatedList(joins, "", false, false);
 		sql += ((where != null) ? " WHERE " + where : "");
 		sql += getFormatedList(groupByColumnReferences, "GROUP BY");
 		sql += ((having != null) ? " HAVING " + having : "");
 		sql += orderByToString(orderByElements);
-		sql += ((limit != null) ? limit+"" : "");
+		sql += ((limit != null) ? limit + "" : "");
 
 		return sql;
 	}
 
-
 	public static String orderByToString(List orderByElements) {
 		return getFormatedList(orderByElements, "ORDER BY");
 	}
 
-	
 	public static String getFormatedList(List list, String expression) {
 		return getFormatedList(list, expression, true, false);
 	}
 
-	
 	public static String getFormatedList(List list, String expression, boolean useComma, boolean useBrackets) {
 		String sql = getStringList(list, useComma, useBrackets);
 
 		if (sql.length() > 0) {
-		    if (expression.length() > 0) {
-		        sql = " " + expression + " " + sql;
-		    } else { 
-		        sql = " " + sql;
-		    }
+			if (expression.length() > 0) {
+				sql = " " + expression + " " + sql;
+			} else {
+				sql = " " + sql;
+			}
 		}
 
 		return sql;
 	}
 
 	/**
-	 * List the toString out put of the objects in the List comma separated. If
-	 * the List is null or empty an empty string is returned.
+	 * List the toString out put of the objects in the List comma separated. If the List is null or empty an empty
+	 * string is returned.
 	 * 
 	 * The same as getStringList(list, true, false)
+	 * 
 	 * @see #getStringList(List, boolean, boolean)
 	 * @param list
 	 *            list of objects with toString methods
@@ -229,32 +225,35 @@ public static String getStringList(List list) {
 	}
 
 	/**
-	 * List the toString out put of the objects in the List that can be comma separated. If
-	 * the List is null or empty an empty string is returned.
+	 * List the toString out put of the objects in the List that can be comma separated. If the List is null or empty an
+	 * empty string is returned.
 	 * 
-	 * @param list list of objects with toString methods
-	 * @param useComma true if the list has to be comma separated
-	 * @param useBrackets true if the list has to be enclosed in brackets
+	 * @param list
+	 *            list of objects with toString methods
+	 * @param useComma
+	 *            true if the list has to be comma separated
+	 * @param useBrackets
+	 *            true if the list has to be enclosed in brackets
 	 * @return comma separated list of the elements in the list
 	 */
 	public static String getStringList(List list, boolean useComma, boolean useBrackets) {
 		String ans = "";
 		String comma = ",";
 		if (!useComma) {
-		    comma = "";
+			comma = "";
 		}
 		if (list != null) {
-		    if (useBrackets) {
-		        ans += "(";
-		    }
-		    
+			if (useBrackets) {
+				ans += "(";
+			}
+
 			for (int i = 0; i < list.size(); i++) {
 				ans += "" + list.get(i) + ((i < list.size() - 1) ? comma + " " : "");
 			}
-			
-		    if (useBrackets) {
-		        ans += ")";
-		    }
+
+			if (useBrackets) {
+				ans += ")";
+			}
 		}
 
 		return ans;
diff --git a/src/net/sf/jsqlparser/statement/select/Select.java b/src/net/sf/jsqlparser/statement/select/Select.java
index 96c1780bd..b5b6d0be2 100644
--- a/src/net/sf/jsqlparser/statement/select/Select.java
+++ b/src/net/sf/jsqlparser/statement/select/Select.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 import java.util.Iterator;
@@ -31,7 +31,7 @@
 public class Select implements Statement {
 	private SelectBody selectBody;
 	private List withItemsList;
-	
+
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
 	}
@@ -43,13 +43,13 @@ public SelectBody getSelectBody() {
 	public void setSelectBody(SelectBody body) {
 		selectBody = body;
 	}
-	
+
 	public String toString() {
 		StringBuffer retval = new StringBuffer();
 		if (withItemsList != null && !withItemsList.isEmpty()) {
 			retval.append("WITH ");
 			for (Iterator iter = withItemsList.iterator(); iter.hasNext();) {
-				WithItem withItem = (WithItem)iter.next();
+				WithItem withItem = (WithItem) iter.next();
 				retval.append(withItem);
 				if (iter.hasNext())
 					retval.append(",");
diff --git a/src/net/sf/jsqlparser/statement/select/SelectBody.java b/src/net/sf/jsqlparser/statement/select/SelectBody.java
index f226e1255..5fa89e307 100644
--- a/src/net/sf/jsqlparser/statement/select/SelectBody.java
+++ b/src/net/sf/jsqlparser/statement/select/SelectBody.java
@@ -19,7 +19,7 @@
  * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 package net.sf.jsqlparser.statement.select;
 
 public interface SelectBody {
diff --git a/src/net/sf/jsqlparser/statement/select/SelectExpressionItem.java b/src/net/sf/jsqlparser/statement/select/SelectExpressionItem.java
index a8c2481d0..9bea468bd 100644
--- a/src/net/sf/jsqlparser/statement/select/SelectExpressionItem.java
+++ b/src/net/sf/jsqlparser/statement/select/SelectExpressionItem.java
@@ -31,7 +31,7 @@
 public class SelectExpressionItem implements SelectItem {
 	private Expression expression;
 	private String alias;
-	
+
 	public String getAlias() {
 		return alias;
 	}
@@ -51,8 +51,8 @@ public void setExpression(Expression expression) {
 	public void accept(SelectItemVisitor selectItemVisitor) {
 		selectItemVisitor.visit(this);
 	}
-	
+
 	public String toString() {
-		return expression+((alias!=null)?" AS "+alias:"");
+		return expression + ((alias != null) ? " AS " + alias : "");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/SelectItemVisitor.java b/src/net/sf/jsqlparser/statement/select/SelectItemVisitor.java
index c7a55893a..25a7edaf5 100644
--- a/src/net/sf/jsqlparser/statement/select/SelectItemVisitor.java
+++ b/src/net/sf/jsqlparser/statement/select/SelectItemVisitor.java
@@ -28,7 +28,9 @@
 
 public interface SelectItemVisitor {
 	public void visit(AllColumns allColumns);
+
 	public void visit(AllTableColumns allTableColumns);
+
 	public void visit(SelectExpressionItem selectExpressionItem);
 
 }
diff --git a/src/net/sf/jsqlparser/statement/select/SelectVisitor.java b/src/net/sf/jsqlparser/statement/select/SelectVisitor.java
index 0f11c6a84..f1a1331e6 100644
--- a/src/net/sf/jsqlparser/statement/select/SelectVisitor.java
+++ b/src/net/sf/jsqlparser/statement/select/SelectVisitor.java
@@ -24,5 +24,6 @@
 
 public interface SelectVisitor {
 	public void visit(PlainSelect plainSelect);
+
 	public void visit(Union union);
 }
diff --git a/src/net/sf/jsqlparser/statement/select/SubJoin.java b/src/net/sf/jsqlparser/statement/select/SubJoin.java
index f6bcf416f..7cb0ada76 100644
--- a/src/net/sf/jsqlparser/statement/select/SubJoin.java
+++ b/src/net/sf/jsqlparser/statement/select/SubJoin.java
@@ -22,7 +22,6 @@
 
 package net.sf.jsqlparser.statement.select;
 
-
 /**
  * A table created by "(tab1 join tab2)".
  */
@@ -42,7 +41,7 @@ public FromItem getLeft() {
 	public void setLeft(FromItem l) {
 		left = l;
 	}
-	
+
 	public Join getJoin() {
 		return join;
 	}
@@ -58,8 +57,8 @@ public String getAlias() {
 	public void setAlias(String string) {
 		alias = string;
 	}
-	
-	public String toString () {
-		return "("+left+" "+join+")"+((alias!=null)?" AS "+alias:"");
+
+	public String toString() {
+		return "(" + left + " " + join + ")" + ((alias != null) ? " AS " + alias : "");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/SubSelect.java b/src/net/sf/jsqlparser/statement/select/SubSelect.java
index 2f7d469e7..92c0d10a8 100644
--- a/src/net/sf/jsqlparser/statement/select/SubSelect.java
+++ b/src/net/sf/jsqlparser/statement/select/SubSelect.java
@@ -27,7 +27,6 @@
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
 import net.sf.jsqlparser.expression.operators.relational.ItemsListVisitor;
 
-
 /**
  * A subselect followed by an optional alias.
  */
@@ -63,7 +62,7 @@ public void accept(ItemsListVisitor itemsListVisitor) {
 		itemsListVisitor.visit(this);
 	}
 
-	public String toString () {
-		return "("+selectBody+")"+((alias!=null)?" AS "+alias:"");
+	public String toString() {
+		return "(" + selectBody + ")" + ((alias != null) ? " AS " + alias : "");
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/select/Top.java b/src/net/sf/jsqlparser/statement/select/Top.java
index b865953d1..c41c448e5 100644
--- a/src/net/sf/jsqlparser/statement/select/Top.java
+++ b/src/net/sf/jsqlparser/statement/select/Top.java
@@ -1,17 +1,16 @@
 package net.sf.jsqlparser.statement.select;
 
 /**
- * A top clause in the form [TOP row_count] 
+ * A top clause in the form [TOP row_count]
  */
 public class Top {
-	private long rowCount ;
+	private long rowCount;
 	private boolean rowCountJdbcParameter = false;
 
 	public long getRowCount() {
 		return rowCount;
 	}
 
-	
 	public void setRowCount(long l) {
 		rowCount = l;
 	}
@@ -23,10 +22,9 @@ public boolean isRowCountJdbcParameter() {
 	public void setRowCountJdbcParameter(boolean b) {
 		rowCountJdbcParameter = b;
 	}
-	
+
 	public String toString() {
-		return "TOP "+(rowCountJdbcParameter?"?":rowCount+"");
+		return "TOP " + (rowCountJdbcParameter ? "?" : rowCount + "");
 	}
 
-
 }
diff --git a/src/net/sf/jsqlparser/statement/select/Union.java b/src/net/sf/jsqlparser/statement/select/Union.java
index c46e2ef62..2f23ad1d8 100644
--- a/src/net/sf/jsqlparser/statement/select/Union.java
+++ b/src/net/sf/jsqlparser/statement/select/Union.java
@@ -33,9 +33,8 @@ public class Union implements SelectBody {
 	private Limit limit;
 	private boolean distinct;
 	private boolean all;
-	
-	
-	public void accept(SelectVisitor selectVisitor){
+
+	public void accept(SelectVisitor selectVisitor) {
 		selectVisitor.visit(this);
 	}
 
@@ -45,6 +44,7 @@ public List getOrderByElements() {
 
 	/**
 	 * the list of {@link PlainSelect}s in this UNION
+	 * 
 	 * @return the list of {@link PlainSelect}s
 	 */
 	public List getPlainSelects() {
@@ -66,7 +66,7 @@ public Limit getLimit() {
 	public void setLimit(Limit limit) {
 		this.limit = limit;
 	}
-	
+
 	/**
 	 * This is not 100% right; every UNION should have their own All/Distinct clause...
 	 */
@@ -88,7 +88,7 @@ public boolean isDistinct() {
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
 	}
-	
+
 	public String toString() {
 
 		String selects = "";
@@ -98,15 +98,13 @@ public String toString() {
 		} else if (isDistinct()) {
 			allDistinct = "DISTINCT ";
 		}
-			
+
 		for (int i = 0; i < plainSelects.size(); i++) {
 			selects += "(" + plainSelects.get(i) + ((i < plainSelects.size() - 1) ? ") UNION " + allDistinct : ")");
 		}
 
-		return selects + 
-				((orderByElements!=null)?PlainSelect.orderByToString(orderByElements):"") +
-				((limit!=null)?limit+"":"");  
+		return selects + ((orderByElements != null) ? PlainSelect.orderByToString(orderByElements) : "")
+				+ ((limit != null) ? limit + "" : "");
 	}
-	
 
 }
diff --git a/src/net/sf/jsqlparser/statement/select/WithItem.java b/src/net/sf/jsqlparser/statement/select/WithItem.java
index f7cc368e7..05afa5add 100644
--- a/src/net/sf/jsqlparser/statement/select/WithItem.java
+++ b/src/net/sf/jsqlparser/statement/select/WithItem.java
@@ -2,50 +2,57 @@
 
 import java.util.List;
 import net.sf.jsqlparser.statement.select.SelectBody;
+
 /**
- * One of the parts of a "WITH" clause of a "SELECT" statement  
+ * One of the parts of a "WITH" clause of a "SELECT" statement
  */
 public class WithItem {
 	private String name;
-	private	List withItemList;
+	private List withItemList;
 	private SelectBody selectBody;
 
 	/**
 	 * The name of this WITH item (for example, "myWITH" in "WITH myWITH AS (SELECT A,B,C))"
+	 * 
 	 * @return the name of this WITH
 	 */
 	public String getName() {
 		return name;
 	}
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	/**
 	 * The {@link SelectBody} of this WITH item is the part after the "AS" keyword
+	 * 
 	 * @return {@link SelectBody} of this WITH item
 	 */
 	public SelectBody getSelectBody() {
 		return selectBody;
 	}
+
 	public void setSelectBody(SelectBody selectBody) {
 		this.selectBody = selectBody;
 	}
-	
+
 	/**
 	 * The {@link SelectItem}s in this WITH (for example the A,B,C in "WITH mywith (A,B,C) AS ...")
+	 * 
 	 * @return a list of {@link SelectItem}s
 	 */
 	public List getWithItemList() {
 		return withItemList;
 	}
+
 	public void setWithItemList(List withItemList) {
 		this.withItemList = withItemList;
 	}
-	
+
 	public String toString() {
-		return name + ((withItemList != null)?" " + PlainSelect.getStringList(withItemList, true, true):"") + " AS (" + selectBody + ")";
+		return name + ((withItemList != null) ? " " + PlainSelect.getStringList(withItemList, true, true) : "")
+				+ " AS (" + selectBody + ")";
 	}
-	
-	
+
 }
diff --git a/src/net/sf/jsqlparser/statement/truncate/Truncate.java b/src/net/sf/jsqlparser/statement/truncate/Truncate.java
index a156f5281..419517162 100644
--- a/src/net/sf/jsqlparser/statement/truncate/Truncate.java
+++ b/src/net/sf/jsqlparser/statement/truncate/Truncate.java
@@ -23,6 +23,6 @@ public void setTable(Table table) {
 	}
 
 	public String toString() {
-		return "TRUNCATE TABLE "+table;
+		return "TRUNCATE TABLE " + table;
 	}
 }
diff --git a/src/net/sf/jsqlparser/statement/update/Update.java b/src/net/sf/jsqlparser/statement/update/Update.java
index a4c914ac8..3ced324e6 100644
--- a/src/net/sf/jsqlparser/statement/update/Update.java
+++ b/src/net/sf/jsqlparser/statement/update/Update.java
@@ -60,6 +60,7 @@ public void setWhere(Expression expression) {
 
 	/**
 	 * The {@link net.sf.jsqlparser.schema.Column}s in this update (as col1 and col2 in UPDATE col1='a', col2='b')
+	 * 
 	 * @return a list of {@link net.sf.jsqlparser.schema.Column}s
 	 */
 	public List getColumns() {
@@ -68,6 +69,7 @@ public List getColumns() {
 
 	/**
 	 * The {@link Expression}s in this update (as 'a' and 'b' in UPDATE col1='a', col2='b')
+	 * 
 	 * @return a list of {@link Expression}s
 	 */
 	public List getExpressions() {
diff --git a/src/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java b/src/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
index 0de9f78f3..7f4cca4e8 100644
--- a/src/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
@@ -7,14 +7,15 @@
 import net.sf.jsqlparser.statement.create.table.Index;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * a {@link net.sf.jsqlparser.statement.create.table.CreateTable}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
+ * {@link net.sf.jsqlparser.statement.create.table.CreateTable}
  */
 public class CreateTableDeParser {
 	protected StringBuffer buffer;
 
 	/**
-	 * @param buffer the buffer that will be filled with the select
+	 * @param buffer
+	 *            the buffer that will be filled with the select
 	 */
 	public CreateTableDeParser(StringBuffer buffer) {
 		this.buffer = buffer;
@@ -30,7 +31,8 @@ public void deParse(CreateTable createTable) {
 				buffer.append(" ");
 				buffer.append(columnDefinition.getColDataType().getDataType());
 				if (columnDefinition.getColDataType().getArgumentsStringList() != null) {
-					for (Iterator iterator = columnDefinition.getColDataType().getArgumentsStringList().iterator(); iterator.hasNext();) {
+					for (Iterator iterator = columnDefinition.getColDataType().getArgumentsStringList().iterator(); iterator
+							.hasNext();) {
 						buffer.append(" ");
 						buffer.append((String) iterator.next());
 					}
@@ -67,7 +69,7 @@ public void deParse(CreateTable createTable) {
 			buffer.append(" \n} ");
 		}
 	}
-	
+
 	public StringBuffer getBuffer() {
 		return buffer;
 	}
diff --git a/src/net/sf/jsqlparser/util/deparser/DeleteDeParser.java b/src/net/sf/jsqlparser/util/deparser/DeleteDeParser.java
index ec9187e12..3dfe74f51 100644
--- a/src/net/sf/jsqlparser/util/deparser/DeleteDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/DeleteDeParser.java
@@ -5,8 +5,8 @@
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * a {@link net.sf.jsqlparser.statement.delete.Delete}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
+ * {@link net.sf.jsqlparser.statement.delete.Delete}
  */
 public class DeleteDeParser {
 	protected StringBuffer buffer;
@@ -16,15 +16,17 @@ public DeleteDeParser() {
 	}
 
 	/**
-	 * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param buffer the buffer that will be filled with the select
+	 * @param expressionVisitor
+	 *            a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param buffer
+	 *            the buffer that will be filled with the select
 	 */
 	public DeleteDeParser(ExpressionVisitor expressionVisitor, StringBuffer buffer) {
 		this.buffer = buffer;
 		this.expressionVisitor = expressionVisitor;
 	}
-	
+
 	public StringBuffer getBuffer() {
 		return buffer;
 	}
@@ -41,6 +43,7 @@ public void deParse(Delete delete) {
 		}
 
 	}
+
 	public ExpressionVisitor getExpressionVisitor() {
 		return expressionVisitor;
 	}
diff --git a/src/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
index 13f19ff60..17f72982c 100644
--- a/src/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -50,288 +50,292 @@
 import net.sf.jsqlparser.statement.select.SubSelect;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * an {@link net.sf.jsqlparser.expression.Expression}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) an
+ * {@link net.sf.jsqlparser.expression.Expression}
  */
 public class ExpressionDeParser implements ExpressionVisitor, ItemsListVisitor {
 
-    protected StringBuffer buffer;
-    protected SelectVisitor selectVisitor;
-    protected boolean useBracketsInExprList = true;
-
-    public ExpressionDeParser() {
-    }
-
-    /**
-     * @param selectVisitor a SelectVisitor to de-parse SubSelects. It has to share the same

-     * StringBuffer as this object in order to work, as:
-     * 
-     * 
-     * StringBuffer myBuf = new StringBuffer();
-     * MySelectDeparser selectDeparser = new  MySelectDeparser();
-     * selectDeparser.setBuffer(myBuf);
-     * ExpressionDeParser expressionDeParser = new ExpressionDeParser(selectDeparser, myBuf);
-     * 
-     * 

-     * @param buffer the buffer that will be filled with the expression
-     */
-    public ExpressionDeParser(SelectVisitor selectVisitor, StringBuffer buffer) {
-        this.selectVisitor = selectVisitor;
-        this.buffer = buffer;
-    }
+	protected StringBuffer buffer;
+	protected SelectVisitor selectVisitor;
+	protected boolean useBracketsInExprList = true;
 
-    public StringBuffer getBuffer() {
-        return buffer;
-    }
+	public ExpressionDeParser() {
+	}
+
+	/**
+	 * @param selectVisitor
+	 *            a SelectVisitor to de-parse SubSelects. It has to share the same

+	 *            StringBuffer as this object in order to work, as:
+	 * 
+	 *            
+	 * 
+	 * StringBuffer myBuf = new StringBuffer();
+	 * MySelectDeparser selectDeparser = new  MySelectDeparser();
+	 * selectDeparser.setBuffer(myBuf);
+	 * ExpressionDeParser expressionDeParser = new ExpressionDeParser(selectDeparser, myBuf);
+	 * 
+	 * 

+	 * @param buffer
+	 *            the buffer that will be filled with the expression
+	 */
+	public ExpressionDeParser(SelectVisitor selectVisitor, StringBuffer buffer) {
+		this.selectVisitor = selectVisitor;
+		this.buffer = buffer;
+	}
+
+	public StringBuffer getBuffer() {
+		return buffer;
+	}
+
+	public void setBuffer(StringBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	public void visit(Addition addition) {
+		visitBinaryExpression(addition, " + ");
+	}
+
+	public void visit(AndExpression andExpression) {
+		visitBinaryExpression(andExpression, " AND ");
+	}
+
+	public void visit(Between between) {
+		between.getLeftExpression().accept(this);
+		if (between.isNot())
+			buffer.append(" NOT");
+
+		buffer.append(" BETWEEN ");
+		between.getBetweenExpressionStart().accept(this);
+		buffer.append(" AND ");
+		between.getBetweenExpressionEnd().accept(this);
+
+	}
+
+	public void visit(Division division) {
+		visitBinaryExpression(division, " / ");
 
-    public void setBuffer(StringBuffer buffer) {
-        this.buffer = buffer;
-    }
+	}
+
+	public void visit(DoubleValue doubleValue) {
+		buffer.append(doubleValue.getValue());
+
+	}
+
+	public void visit(EqualsTo equalsTo) {
+		visitBinaryExpression(equalsTo, " = ");
+	}
+
+	public void visit(GreaterThan greaterThan) {
+		visitBinaryExpression(greaterThan, " > ");
+	}
 
-    public void visit(Addition addition) {
-        visitBinaryExpression(addition, " + ");
-    }
+	public void visit(GreaterThanEquals greaterThanEquals) {
+		visitBinaryExpression(greaterThanEquals, " >= ");
 
-    public void visit(AndExpression andExpression) {
-        visitBinaryExpression(andExpression, " AND ");
-    }
+	}
+
+	public void visit(InExpression inExpression) {
+
+		inExpression.getLeftExpression().accept(this);
+		if (inExpression.isNot())
+			buffer.append(" NOT");
+		buffer.append(" IN ");
+
+		inExpression.getItemsList().accept(this);
+	}
 
-    public void visit(Between between) {
-        between.getLeftExpression().accept(this);
-        if (between.isNot())
-            buffer.append(" NOT");
+	public void visit(InverseExpression inverseExpression) {
+		buffer.append("-");
+		inverseExpression.getExpression().accept(this);
+	}
 
-        buffer.append(" BETWEEN ");
-        between.getBetweenExpressionStart().accept(this);
-        buffer.append(" AND ");
-        between.getBetweenExpressionEnd().accept(this);
+	public void visit(IsNullExpression isNullExpression) {
+		isNullExpression.getLeftExpression().accept(this);
+		if (isNullExpression.isNot()) {
+			buffer.append(" IS NOT NULL");
+		} else {
+			buffer.append(" IS NULL");
+		}
+	}
 
-    }
+	public void visit(JdbcParameter jdbcParameter) {
+		buffer.append("?");
 
-    public void visit(Division division) {
-        visitBinaryExpression(division, " / ");
+	}
 
-    }
+	public void visit(LikeExpression likeExpression) {
+		visitBinaryExpression(likeExpression, " LIKE ");
 
-    public void visit(DoubleValue doubleValue) {
-        buffer.append(doubleValue.getValue());
+	}
 
-    }
+	public void visit(ExistsExpression existsExpression) {
+		if (existsExpression.isNot()) {
+			buffer.append(" NOT EXISTS ");
+		} else {
+			buffer.append(" EXISTS ");
+		}
+		existsExpression.getRightExpression().accept(this);
+	}
 
-    public void visit(EqualsTo equalsTo) {
-        visitBinaryExpression(equalsTo, " = ");
-    }
+	public void visit(LongValue longValue) {
+		buffer.append(longValue.getStringValue());
 
-    public void visit(GreaterThan greaterThan) {
-        visitBinaryExpression(greaterThan, " > ");
-    }
+	}
 
-    public void visit(GreaterThanEquals greaterThanEquals) {
-        visitBinaryExpression(greaterThanEquals, " >= ");
+	public void visit(MinorThan minorThan) {
+		visitBinaryExpression(minorThan, " < ");
 
-    }
+	}
 
-    public void visit(InExpression inExpression) {
+	public void visit(MinorThanEquals minorThanEquals) {
+		visitBinaryExpression(minorThanEquals, " <= ");
 
-        inExpression.getLeftExpression().accept(this);
-        if (inExpression.isNot())
-            buffer.append(" NOT");
-        buffer.append(" IN ");
+	}
 
-        inExpression.getItemsList().accept(this);
-    }
+	public void visit(Multiplication multiplication) {
+		visitBinaryExpression(multiplication, " * ");
 
-    public void visit(InverseExpression inverseExpression) {
-        buffer.append("-");
-        inverseExpression.getExpression().accept(this);
-    }
+	}
 
-    public void visit(IsNullExpression isNullExpression) {
-        isNullExpression.getLeftExpression().accept(this);
-        if (isNullExpression.isNot()) {
-            buffer.append(" IS NOT NULL");
-        } else {
-            buffer.append(" IS NULL");
-        }
-    }
+	public void visit(NotEqualsTo notEqualsTo) {
+		visitBinaryExpression(notEqualsTo, " <> ");
 
-    public void visit(JdbcParameter jdbcParameter) {
-        buffer.append("?");
+	}
 
-    }
+	public void visit(NullValue nullValue) {
+		buffer.append("NULL");
 
-    public void visit(LikeExpression likeExpression) {
-        visitBinaryExpression(likeExpression, " LIKE ");
+	}
 
-    }
+	public void visit(OrExpression orExpression) {
+		visitBinaryExpression(orExpression, " OR ");
 
-    public void visit(ExistsExpression existsExpression) {
-        if (existsExpression.isNot()) {
-            buffer.append(" NOT EXISTS ");
-        } else {
-            buffer.append(" EXISTS ");
-        }
-        existsExpression.getRightExpression().accept(this);
-    }
+	}
 
-    public void visit(LongValue longValue) {
-        buffer.append(longValue.getStringValue());
+	public void visit(Parenthesis parenthesis) {
+		if (parenthesis.isNot())
+			buffer.append(" NOT ");
 
-    }
+		buffer.append("(");
+		parenthesis.getExpression().accept(this);
+		buffer.append(")");
 
-    public void visit(MinorThan minorThan) {
-        visitBinaryExpression(minorThan, " < ");
+	}
 
-    }
+	public void visit(StringValue stringValue) {
+		buffer.append("'" + stringValue.getValue() + "'");
 
-    public void visit(MinorThanEquals minorThanEquals) {
-        visitBinaryExpression(minorThanEquals, " <= ");
+	}
 
-    }
+	public void visit(Subtraction subtraction) {
+		visitBinaryExpression(subtraction, "-");
 
-    public void visit(Multiplication multiplication) {
-        visitBinaryExpression(multiplication, " * ");
+	}
 
-    }
+	private void visitBinaryExpression(BinaryExpression binaryExpression, String operator) {
+		if (binaryExpression.isNot())
+			buffer.append(" NOT ");
+		binaryExpression.getLeftExpression().accept(this);
+		buffer.append(operator);
+		binaryExpression.getRightExpression().accept(this);
 
-    public void visit(NotEqualsTo notEqualsTo) {
-        visitBinaryExpression(notEqualsTo, " <> ");
+	}
 
-    }
+	public void visit(SubSelect subSelect) {
+		buffer.append("(");
+		subSelect.getSelectBody().accept(selectVisitor);
+		buffer.append(")");
+	}
 
-    public void visit(NullValue nullValue) {
-        buffer.append("NULL");
+	public void visit(Column tableColumn) {
+		String tableName = tableColumn.getTable().getWholeTableName();
+		if (tableName != null) {
+			buffer.append(tableName + ".");
+		}
 
-    }
+		buffer.append(tableColumn.getColumnName());
+	}
 
-    public void visit(OrExpression orExpression) {
-        visitBinaryExpression(orExpression, " OR ");
+	public void visit(Function function) {
+		if (function.isEscaped()) {
+			buffer.append("{fn ");
+		}
 
-    }
+		buffer.append(function.getName());
+		if (function.isAllColumns()) {
+			buffer.append("(*)");
+		} else if (function.getParameters() == null) {
+			buffer.append("()");
+		} else {
+			boolean oldUseBracketsInExprList = useBracketsInExprList;
+			if (function.isDistinct()) {
+				useBracketsInExprList = false;
+				buffer.append("(DISTINCT ");
+			}
+			visit(function.getParameters());
+			useBracketsInExprList = oldUseBracketsInExprList;
+			if (function.isDistinct()) {
+				buffer.append(")");
+			}
+		}
 
-    public void visit(Parenthesis parenthesis) {
-    	if (parenthesis.isNot())
-            buffer.append(" NOT ");
-    		
-        buffer.append("(");
-        parenthesis.getExpression().accept(this);
-        buffer.append(")");
+		if (function.isEscaped()) {
+			buffer.append("}");
+		}
 
-    }
-
-    public void visit(StringValue stringValue) {
-        buffer.append("'" + stringValue.getValue() + "'");
+	}
 
-    }
+	public void visit(ExpressionList expressionList) {
+		if (useBracketsInExprList)
+			buffer.append("(");
+		for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
+			Expression expression = (Expression) iter.next();
+			expression.accept(this);
+			if (iter.hasNext())
+				buffer.append(", ");
+		}
+		if (useBracketsInExprList)
+			buffer.append(")");
+	}
 
-    public void visit(Subtraction subtraction) {
-        visitBinaryExpression(subtraction, "-");
-
-    }
+	public SelectVisitor getSelectVisitor() {
+		return selectVisitor;
+	}
 
-    private void visitBinaryExpression(BinaryExpression binaryExpression, String operator) {
-        if (binaryExpression.isNot())
-            buffer.append(" NOT ");
-        binaryExpression.getLeftExpression().accept(this);
-        buffer.append(operator);
-        binaryExpression.getRightExpression().accept(this);
-
-    }
-
-    public void visit(SubSelect subSelect) {
-        buffer.append("(");
-        subSelect.getSelectBody().accept(selectVisitor);
-        buffer.append(")");
-    }
-
-    public void visit(Column tableColumn) {
-        String tableName = tableColumn.getTable().getWholeTableName();
-        if (tableName != null) {
-            buffer.append(tableName + ".");
-        }
-
-        buffer.append(tableColumn.getColumnName());
-    }
+	public void setSelectVisitor(SelectVisitor visitor) {
+		selectVisitor = visitor;
+	}
 
-    public void visit(Function function) {
-        if (function.isEscaped()) {
-            buffer.append("{fn ");
-        }
+	public void visit(DateValue dateValue) {
+		buffer.append("{d '" + dateValue.getValue().toString() + "'}");
+	}
 
-        buffer.append(function.getName());
-        if (function.isAllColumns()) {
-            buffer.append("(*)");
-        } else if (function.getParameters() == null) {
-            buffer.append("()");
-        } else {
-        	boolean oldUseBracketsInExprList = useBracketsInExprList;
-            if (function.isDistinct()) {
-            	useBracketsInExprList = false;
-        		buffer.append("(DISTINCT ");
-            }
-            visit(function.getParameters());
-            useBracketsInExprList = oldUseBracketsInExprList;
-            if (function.isDistinct()) {
-        		buffer.append(")");
-            }
-        }
+	public void visit(TimestampValue timestampValue) {
+		buffer.append("{ts '" + timestampValue.getValue().toString() + "'}");
+	}
 
-        if (function.isEscaped()) {
-            buffer.append("}");
-        }
-
-    }
-
-    public void visit(ExpressionList expressionList) {
-    	if (useBracketsInExprList)
-    		buffer.append("(");
-        for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
-            Expression expression = (Expression) iter.next();
-            expression.accept(this);
-            if (iter.hasNext())
-                buffer.append(", ");
-        }
-    	if (useBracketsInExprList)
-    		buffer.append(")");
-    }
-
-
-    public SelectVisitor getSelectVisitor() {
-        return selectVisitor;
-    }
-
-    public void setSelectVisitor(SelectVisitor visitor) {
-        selectVisitor = visitor;
-    }
-
-    public void visit(DateValue dateValue) {
-        buffer.append("{d '" + dateValue.getValue().toString() + "'}");
-    }
-    public void visit(TimestampValue timestampValue) {
-        buffer.append("{ts '" + timestampValue.getValue().toString() + "'}");
-    }
-    public void visit(TimeValue timeValue) {
-        buffer.append("{t '" + timeValue.getValue().toString() + "'}");
-    }
+	public void visit(TimeValue timeValue) {
+		buffer.append("{t '" + timeValue.getValue().toString() + "'}");
+	}
 
 	public void visit(CaseExpression caseExpression) {
 		buffer.append("CASE ");
 		Expression switchExp = caseExpression.getSwitchExpression();
-		if( switchExp != null ) {
+		if (switchExp != null) {
 			switchExp.accept(this);
 		}
-		
+
 		List clauses = caseExpression.getWhenClauses();
 		for (Iterator iter = clauses.iterator(); iter.hasNext();) {
 			Expression exp = (Expression) iter.next();
 			exp.accept(this);
 		}
-		
+
 		Expression elseExp = caseExpression.getElseExpression();
-		if( elseExp != null ) {
+		if (elseExp != null) {
 			elseExp.accept(this);
 		}
-		
+
 		buffer.append(" END");
 	}
 
@@ -344,32 +348,32 @@ public void visit(WhenClause whenClause) {
 
 	public void visit(AllComparisonExpression allComparisonExpression) {
 		buffer.append(" ALL ");
-		allComparisonExpression.GetSubSelect().accept((ExpressionVisitor)this);
+		allComparisonExpression.GetSubSelect().accept((ExpressionVisitor) this);
 	}
 
 	public void visit(AnyComparisonExpression anyComparisonExpression) {
 		buffer.append(" ANY ");
-		anyComparisonExpression.GetSubSelect().accept((ExpressionVisitor)this);
+		anyComparisonExpression.GetSubSelect().accept((ExpressionVisitor) this);
 	}
 
 	public void visit(Concat concat) {
-        visitBinaryExpression(concat, " || ");
+		visitBinaryExpression(concat, " || ");
 	}
 
 	public void visit(Matches matches) {
-        visitBinaryExpression(matches, " @@ ");
+		visitBinaryExpression(matches, " @@ ");
 	}
 
 	public void visit(BitwiseAnd bitwiseAnd) {
-        visitBinaryExpression(bitwiseAnd, " & ");
+		visitBinaryExpression(bitwiseAnd, " & ");
 	}
 
 	public void visit(BitwiseOr bitwiseOr) {
-        visitBinaryExpression(bitwiseOr, " | ");
+		visitBinaryExpression(bitwiseOr, " | ");
 	}
 
 	public void visit(BitwiseXor bitwiseXor) {
-        visitBinaryExpression(bitwiseXor, " ^ ");
+		visitBinaryExpression(bitwiseXor, " ^ ");
 	}
 
 }
\ No newline at end of file
diff --git a/src/net/sf/jsqlparser/util/deparser/InsertDeParser.java b/src/net/sf/jsqlparser/util/deparser/InsertDeParser.java
index 61b7f3aba..0e746c543 100644
--- a/src/net/sf/jsqlparser/util/deparser/InsertDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/InsertDeParser.java
@@ -11,10 +11,9 @@
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
-
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * an {@link net.sf.jsqlparser.statement.insert.Insert}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) an
+ * {@link net.sf.jsqlparser.statement.insert.Insert}
  */
 public class InsertDeParser implements ItemsListVisitor {
 	protected StringBuffer buffer;
@@ -25,12 +24,16 @@ public InsertDeParser() {
 	}
 
 	/**
-	 * @param expressionVisitor a {@link ExpressionVisitor} to de-parse {@link net.sf.jsqlparser.expression.Expression}s. It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param selectVisitor a {@link SelectVisitor} to de-parse {@link net.sf.jsqlparser.statement.select.Select}s.
-	 * It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param buffer the buffer that will be filled with the insert
+	 * @param expressionVisitor
+	 *            a {@link ExpressionVisitor} to de-parse {@link net.sf.jsqlparser.expression.Expression}s. It has to
+	 *            share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param selectVisitor
+	 *            a {@link SelectVisitor} to de-parse {@link net.sf.jsqlparser.statement.select.Select}s. It has to
+	 *            share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param buffer
+	 *            the buffer that will be filled with the insert
 	 */
 	public InsertDeParser(ExpressionVisitor expressionVisitor, SelectVisitor selectVisitor, StringBuffer buffer) {
 		this.buffer = buffer;
@@ -75,10 +78,11 @@ public void visit(ExpressionList expressionList) {
 		}
 		buffer.append(")");
 	}
-	
+
 	public void visit(SubSelect subSelect) {
 		subSelect.getSelectBody().accept(selectVisitor);
 	}
+
 	public ExpressionVisitor getExpressionVisitor() {
 		return expressionVisitor;
 	}
diff --git a/src/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java b/src/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
index bba5c074e..dc40e2e55 100644
--- a/src/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
@@ -12,8 +12,8 @@
 import net.sf.jsqlparser.statement.select.SubSelect;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * a {@link net.sf.jsqlparser.statement.replace.Replace}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
+ * {@link net.sf.jsqlparser.statement.replace.Replace}
  */
 public class ReplaceDeParser implements ItemsListVisitor {
 	protected StringBuffer buffer;
@@ -24,12 +24,15 @@ public ReplaceDeParser() {
 	}
 
 	/**
-	 * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param selectVisitor a {@link SelectVisitor} to de-parse {@link net.sf.jsqlparser.statement.select.Select}s.
-	 * It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param buffer the buffer that will be filled with the select
+	 * @param expressionVisitor
+	 *            a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param selectVisitor
+	 *            a {@link SelectVisitor} to de-parse {@link net.sf.jsqlparser.statement.select.Select}s. It has to
+	 *            share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param buffer
+	 *            the buffer that will be filled with the select
 	 */
 	public ReplaceDeParser(ExpressionVisitor expressionVisitor, SelectVisitor selectVisitor, StringBuffer buffer) {
 		this.buffer = buffer;
diff --git a/src/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/net/sf/jsqlparser/util/deparser/SelectDeParser.java
index acc90f086..1472902c1 100644
--- a/src/net/sf/jsqlparser/util/deparser/SelectDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -26,8 +26,8 @@
 import net.sf.jsqlparser.statement.select.Union;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * a {@link net.sf.jsqlparser.statement.select.Select}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
+ * {@link net.sf.jsqlparser.statement.select.Select}
  */
 public class SelectDeParser implements SelectVisitor, OrderByVisitor, SelectItemVisitor, FromItemVisitor {
 	protected StringBuffer buffer;
@@ -37,9 +37,11 @@ public SelectDeParser() {
 	}
 
 	/**
-	 * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param buffer the buffer that will be filled with the select
+	 * @param expressionVisitor
+	 *            a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param buffer
+	 *            the buffer that will be filled with the select
 	 */
 	public SelectDeParser(ExpressionVisitor expressionVisitor, StringBuffer buffer) {
 		this.buffer = buffer;
@@ -76,7 +78,7 @@ public void visit(PlainSelect plainSelect) {
 		}
 
 		buffer.append(" ");
-		
+
 		if (plainSelect.getFromItem() != null) {
 			buffer.append("FROM ");
 			plainSelect.getFromItem().accept(this);
@@ -85,7 +87,7 @@ public void visit(PlainSelect plainSelect) {
 		if (plainSelect.getJoins() != null) {
 			for (Iterator iter = plainSelect.getJoins().iterator(); iter.hasNext();) {
 				Join join = (Join) iter.next();
-				deparseJoin(join);		
+				deparseJoin(join);
 			}
 		}
 
@@ -146,7 +148,7 @@ public void visit(OrderByElement orderBy) {
 		orderBy.getExpression().accept(expressionVisitor);
 		if (orderBy.isAsc())
 			buffer.append(" ASC");
-		else     
+		else
 			buffer.append(" DESC");
 	}
 
@@ -196,7 +198,7 @@ public void deparseOrderBy(List orderByElements) {
 	}
 
 	public void deparseLimit(Limit limit) {
-		// LIMIT n OFFSET skip 
+		// LIMIT n OFFSET skip
 		buffer.append(" LIMIT ");
 		if (limit.isRowCountJdbcParameter()) {
 			buffer.append("?");
@@ -204,10 +206,9 @@ public void deparseLimit(Limit limit) {
 			buffer.append(limit.getRowCount());
 		} else {
 			/*
-			 from mysql docs:
-			 For compatibility with PostgreSQL, MySQL also supports the LIMIT row_count OFFSET offset syntax.
-			 To retrieve all rows from a certain offset up to the end of the result set, you can use some large number
-			 for the second parameter. 
+			 * from mysql docs: For compatibility with PostgreSQL, MySQL also supports the LIMIT row_count OFFSET offset
+			 * syntax. To retrieve all rows from a certain offset up to the end of the result set, you can use some
+			 * large number for the second parameter.
 			 */
 			buffer.append("18446744073709551615");
 		}
@@ -247,9 +248,8 @@ public void visit(SubJoin subjoin) {
 	public void deparseJoin(Join join) {
 		if (join.isSimple())
 			buffer.append(", ");
-		else
-		{
-	
+		else {
+
 			if (join.isRight())
 				buffer.append("RIGHT ");
 			else if (join.isNatural())
@@ -258,7 +258,7 @@ else if (join.isFull())
 				buffer.append("FULL ");
 			else if (join.isLeft())
 				buffer.append("LEFT ");
-			
+
 			if (join.isOuter())
 				buffer.append("OUTER ");
 			else if (join.isInner())
@@ -267,7 +267,7 @@ else if (join.isInner())
 			buffer.append("JOIN ");
 
 		}
-		
+
 		FromItem fromItem = join.getRightItem();
 		fromItem.accept(this);
 		if (join.getOnExpression() != null) {
diff --git a/src/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/net/sf/jsqlparser/util/deparser/StatementDeParser.java
index 321878369..302bb0560 100644
--- a/src/net/sf/jsqlparser/util/deparser/StatementDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/StatementDeParser.java
@@ -66,7 +66,7 @@ public void visit(Select select) {
 		if (select.getWithItemsList() != null && !select.getWithItemsList().isEmpty()) {
 			buffer.append("WITH ");
 			for (Iterator iter = select.getWithItemsList().iterator(); iter.hasNext();) {
-				WithItem withItem = (WithItem)iter.next();
+				WithItem withItem = (WithItem) iter.next();
 				buffer.append(withItem);
 				if (iter.hasNext())
 					buffer.append(",");
diff --git a/src/net/sf/jsqlparser/util/deparser/UpdateDeParser.java b/src/net/sf/jsqlparser/util/deparser/UpdateDeParser.java
index 51a8a7119..fb7c4a573 100644
--- a/src/net/sf/jsqlparser/util/deparser/UpdateDeParser.java
+++ b/src/net/sf/jsqlparser/util/deparser/UpdateDeParser.java
@@ -6,20 +6,22 @@
 import net.sf.jsqlparser.statement.update.Update;
 
 /**
- * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string)
- * an {@link net.sf.jsqlparser.statement.update.Update}
+ * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) an
+ * {@link net.sf.jsqlparser.statement.update.Update}
  */
 public class UpdateDeParser {
 	protected StringBuffer buffer;
 	protected ExpressionVisitor expressionVisitor;
-	
+
 	public UpdateDeParser() {
 	}
-	
+
 	/**
-	 * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

-	 * StringBuffer (buffer parameter) as this object in order to work
-	 * @param buffer the buffer that will be filled with the select
+	 * @param expressionVisitor
+	 *            a {@link ExpressionVisitor} to de-parse expressions. It has to share the same

+	 *            StringBuffer (buffer parameter) as this object in order to work
+	 * @param buffer
+	 *            the buffer that will be filled with the select
 	 */
 	public UpdateDeParser(ExpressionVisitor expressionVisitor, StringBuffer buffer) {
 		this.buffer = buffer;
@@ -47,7 +49,7 @@ public void deParse(Update update) {
 			}
 
 		}
-		
+
 		if (update.getWhere() != null) {
 			buffer.append(" WHERE ");
 			update.getWhere().accept(expressionVisitor);
diff --git a/testsrc/net/sf/jsqlparser/test/TestException.java b/testsrc/net/sf/jsqlparser/test/TestException.java
index 570f5f4f8..e2280b0b4 100644
--- a/testsrc/net/sf/jsqlparser/test/TestException.java
+++ b/testsrc/net/sf/jsqlparser/test/TestException.java
@@ -22,7 +22,6 @@
 
 package net.sf.jsqlparser.test;
 
-
 /**
  * An exception class with stack trace informations
  */
@@ -45,7 +44,7 @@ public TestException(String arg0, Throwable arg1) {
 		super(arg0);
 		this.cause = arg1;
 	}
-	
+
 	public Throwable getCause() {
 		return cause;
 	}
diff --git a/testsrc/net/sf/jsqlparser/test/create/CreateTableTest.java b/testsrc/net/sf/jsqlparser/test/create/CreateTableTest.java
index 460b6c41c..413ad7432 100644
--- a/testsrc/net/sf/jsqlparser/test/create/CreateTableTest.java
+++ b/testsrc/net/sf/jsqlparser/test/create/CreateTableTest.java
@@ -26,8 +26,7 @@ public CreateTableTest(String arg0) {
 	}
 
 	public void testCreateTable() throws JSQLParserException {
-		String statement =
-			"CREATE TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, "
+		String statement = "CREATE TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, "
 				+ "PRIMARY KEY (mycol2, mycol)) type = myisam";
 		CreateTable createTable = (CreateTable) parserManager.parse(new StringReader(statement));
 		assertEquals(2, createTable.getColumnDefinitions().size());
@@ -35,12 +34,13 @@ public void testCreateTable() throws JSQLParserException {
 		assertEquals("mycol2", ((ColumnDefinition) createTable.getColumnDefinitions().get(1)).getColumnName());
 		assertEquals("PRIMARY KEY", ((Index) createTable.getIndexes().get(0)).getType());
 		assertEquals("mycol", ((Index) createTable.getIndexes().get(0)).getColumnsNames().get(1));
-		assertEquals(statement, ""+createTable);
+		assertEquals(statement, "" + createTable);
 	}
 
 	public void testRUBiSCreateList() throws Exception {
 
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator + "RUBiS-create-requests.txt"));
+		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator
+				+ "RUBiS-create-requests.txt"));
 		TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
 
 		try {
@@ -81,10 +81,10 @@ public void testRUBiSCreateList() throws Exception {
 
 						List colsListList = new ArrayList();
 						while (tokenizer.hasMoreTokens()) {
-						    colsListList.add(tokenizer.nextToken());
+							colsListList.add(tokenizer.nextToken());
 						}
-						
-						colsList = (String[])colsListList.toArray(new String[colsListList.size()]); 
+
+						colsList = (String[]) colsListList.toArray(new String[colsListList.size()]);
 
 					}
 					List colsFound = new ArrayList();
@@ -96,9 +96,8 @@ public void testRUBiSCreateList() throws Exception {
 							if (createTable.getIndexes() != null) {
 								for (Iterator iterator = createTable.getIndexes().iterator(); iterator.hasNext();) {
 									Index index = (Index) iterator.next();
-									if (index.getType().equals("PRIMARY KEY")
-										&& index.getColumnsNames().size() == 1
-										&& index.getColumnsNames().get(0).equals(colName)) {
+									if (index.getType().equals("PRIMARY KEY") && index.getColumnsNames().size() == 1
+											&& index.getColumnsNames().get(0).equals(colName)) {
 										unique = true;
 									}
 
@@ -107,11 +106,13 @@ public void testRUBiSCreateList() throws Exception {
 
 							if (!unique) {
 								if (columnDefinition.getColumnSpecStrings() != null) {
-									for (Iterator iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator.hasNext();) {
+									for (Iterator iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator
+											.hasNext();) {
 										String par = (String) iterator.next();
 										if (par.equals("UNIQUE")) {
 											unique = true;
-										} else if (par.equals("PRIMARY") && iterator.hasNext() && iterator.next().equals("KEY")) {
+										} else if (par.equals("PRIMARY") && iterator.hasNext()
+												&& iterator.next().equals("KEY")) {
 											unique = true;
 										}
 									}
@@ -148,7 +149,9 @@ private String getLine(BufferedReader in) throws Exception {
 			line = in.readLine();
 			if (line != null) {
 				line.trim();
-				if ((line.length() != 0) && ((line.length() < 2) || (line.length() >= 2) && !(line.charAt(0) == '/' && line.charAt(1) == '/')))
+				if ((line.length() != 0)
+						&& ((line.length() < 2) || (line.length() >= 2)
+								&& !(line.charAt(0) == '/' && line.charAt(1) == '/')))
 					break;
 			} else {
 				break;
diff --git a/testsrc/net/sf/jsqlparser/test/delete/DeleteTest.java b/testsrc/net/sf/jsqlparser/test/delete/DeleteTest.java
index 189f47d61..751c39c87 100644
--- a/testsrc/net/sf/jsqlparser/test/delete/DeleteTest.java
+++ b/testsrc/net/sf/jsqlparser/test/delete/DeleteTest.java
@@ -19,7 +19,7 @@ public void testDelete() throws JSQLParserException {
 
 		Delete delete = (Delete) parserManager.parse(new StringReader(statement));
 		assertEquals("mytable", delete.getTable().getName());
-		assertEquals(statement, ""+delete);
+		assertEquals(statement, "" + delete);
 	}
 
 	public static void main(String[] args) {
diff --git a/testsrc/net/sf/jsqlparser/test/drop/DropTest.java b/testsrc/net/sf/jsqlparser/test/drop/DropTest.java
index beaf8f157..a2d698c51 100644
--- a/testsrc/net/sf/jsqlparser/test/drop/DropTest.java
+++ b/testsrc/net/sf/jsqlparser/test/drop/DropTest.java
@@ -15,20 +15,18 @@ public DropTest(String arg0) {
 	}
 
 	public void testDrop() throws JSQLParserException {
-		String statement =
-			"DROP TABLE mytab";
+		String statement = "DROP TABLE mytab";
 		Drop drop = (Drop) parserManager.parse(new StringReader(statement));
 		assertEquals("TABLE", drop.getType());
 		assertEquals("mytab", drop.getName());
-		assertEquals(statement, ""+drop);
-		
-		statement =
-					"DROP INDEX myindex CASCADE";
+		assertEquals(statement, "" + drop);
+
+		statement = "DROP INDEX myindex CASCADE";
 		drop = (Drop) parserManager.parse(new StringReader(statement));
 		assertEquals("INDEX", drop.getType());
 		assertEquals("myindex", drop.getName());
 		assertEquals("CASCADE", drop.getParameters().get(0));
-		assertEquals(statement, ""+drop);
+		assertEquals(statement, "" + drop);
 	}
 
 	public static void main(String[] args) {
diff --git a/testsrc/net/sf/jsqlparser/test/insert/InsertTest.java b/testsrc/net/sf/jsqlparser/test/insert/InsertTest.java
index d6ebc2503..15a26a3ec 100644
--- a/testsrc/net/sf/jsqlparser/test/insert/InsertTest.java
+++ b/testsrc/net/sf/jsqlparser/test/insert/InsertTest.java
@@ -32,18 +32,20 @@ public void testRegularInsert() throws JSQLParserException {
 		assertEquals("col2", ((Column) insert.getColumns().get(1)).getColumnName());
 		assertEquals("col3", ((Column) insert.getColumns().get(2)).getColumnName());
 		assertEquals(3, ((ExpressionList) insert.getItemsList()).getExpressions().size());
-		assertTrue (((ExpressionList) insert.getItemsList()).getExpressions().get(0) instanceof JdbcParameter);
-		assertEquals("sadfsd", ((StringValue) ((ExpressionList) insert.getItemsList()).getExpressions().get(1)).getValue());
+		assertTrue(((ExpressionList) insert.getItemsList()).getExpressions().get(0) instanceof JdbcParameter);
+		assertEquals("sadfsd",
+				((StringValue) ((ExpressionList) insert.getItemsList()).getExpressions().get(1)).getValue());
 		assertEquals(234, ((LongValue) ((ExpressionList) insert.getItemsList()).getExpressions().get(2)).getValue());
-		assertEquals(statement, ""+insert);
+		assertEquals(statement, "" + insert);
 
-		 statement = "INSERT INTO myschema.mytable VALUES (?, ?, 2.3)";
-		 insert = (Insert) parserManager.parse(new StringReader(statement));
+		statement = "INSERT INTO myschema.mytable VALUES (?, ?, 2.3)";
+		insert = (Insert) parserManager.parse(new StringReader(statement));
 		assertEquals("myschema.mytable", insert.getTable().getWholeTableName());
 		assertEquals(3, ((ExpressionList) insert.getItemsList()).getExpressions().size());
-		assertTrue (((ExpressionList) insert.getItemsList()).getExpressions().get(0) instanceof JdbcParameter);
-		assertEquals(2.3, ((DoubleValue) ((ExpressionList) insert.getItemsList()).getExpressions().get(2)).getValue(), 0.0);
-		assertEquals(statement, ""+insert);
+		assertTrue(((ExpressionList) insert.getItemsList()).getExpressions().get(0) instanceof JdbcParameter);
+		assertEquals(2.3, ((DoubleValue) ((ExpressionList) insert.getItemsList()).getExpressions().get(2)).getValue(),
+				0.0);
+		assertEquals(statement, "" + insert);
 
 	}
 
@@ -55,12 +57,13 @@ public void testInsertFromSelect() throws JSQLParserException {
 		assertEquals("col1", ((Column) insert.getColumns().get(0)).getColumnName());
 		assertEquals("col2", ((Column) insert.getColumns().get(1)).getColumnName());
 		assertEquals("col3", ((Column) insert.getColumns().get(2)).getColumnName());
-		assertTrue (insert.getItemsList() instanceof SubSelect);
-		assertEquals("mytable2", ((Table) ((PlainSelect) ((SubSelect)insert.getItemsList()).getSelectBody()).getFromItem()).getName());
-		
-		//toString uses brakets
+		assertTrue(insert.getItemsList() instanceof SubSelect);
+		assertEquals("mytable2",
+				((Table) ((PlainSelect) ((SubSelect) insert.getItemsList()).getSelectBody()).getFromItem()).getName());
+
+		// toString uses brakets
 		String statementToString = "INSERT INTO mytable (col1, col2, col3) (SELECT * FROM mytable2)";
-		assertEquals(statementToString, ""+insert);
+		assertEquals(statementToString, "" + insert);
 	}
 
 	public static void main(String[] args) {
diff --git a/testsrc/net/sf/jsqlparser/test/replace/ReplaceTest.java b/testsrc/net/sf/jsqlparser/test/replace/ReplaceTest.java
index bcc9c93e1..033179af6 100644
--- a/testsrc/net/sf/jsqlparser/test/replace/ReplaceTest.java
+++ b/testsrc/net/sf/jsqlparser/test/replace/ReplaceTest.java
@@ -28,10 +28,10 @@ public void testReplaceSyntax1() throws JSQLParserException {
 		assertEquals("col1", ((Column) replace.getColumns().get(0)).getColumnName());
 		assertEquals("col2", ((Column) replace.getColumns().get(1)).getColumnName());
 		assertEquals("col3", ((Column) replace.getColumns().get(2)).getColumnName());
-		assertEquals("as", ((StringValue)replace.getExpressions().get(0)).getValue());
+		assertEquals("as", ((StringValue) replace.getExpressions().get(0)).getValue());
 		assertTrue(replace.getExpressions().get(1) instanceof JdbcParameter);
-		assertEquals(565, ((LongValue)replace.getExpressions().get(2)).getValue());
-		assertEquals(statement, ""+replace);
+		assertEquals(565, ((LongValue) replace.getExpressions().get(2)).getValue());
+		assertEquals(statement, "" + replace);
 
 	}
 
@@ -43,13 +43,12 @@ public void testReplaceSyntax2() throws JSQLParserException {
 		assertEquals("col1", ((Column) replace.getColumns().get(0)).getColumnName());
 		assertEquals("col2", ((Column) replace.getColumns().get(1)).getColumnName());
 		assertEquals("col3", ((Column) replace.getColumns().get(2)).getColumnName());
-		assertEquals("as", ((StringValue) ((ExpressionList)replace.getItemsList()).getExpressions().get(0)).getValue());
-		assertTrue(((ExpressionList)replace.getItemsList()).getExpressions().get(1) instanceof JdbcParameter);
-		assertEquals(565, ((LongValue) ((ExpressionList)replace.getItemsList()).getExpressions().get(2)).getValue());
-		assertEquals(statement, ""+replace);
+		assertEquals("as", ((StringValue) ((ExpressionList) replace.getItemsList()).getExpressions().get(0)).getValue());
+		assertTrue(((ExpressionList) replace.getItemsList()).getExpressions().get(1) instanceof JdbcParameter);
+		assertEquals(565, ((LongValue) ((ExpressionList) replace.getItemsList()).getExpressions().get(2)).getValue());
+		assertEquals(statement, "" + replace);
 	}
 
-
 	public void testReplaceSyntax3() throws JSQLParserException {
 		String statement = "REPLACE mytable (col1, col2, col3) SELECT * FROM mytable3";
 		Replace replace = (Replace) parserManager.parse(new StringReader(statement));
@@ -59,8 +58,8 @@ public void testReplaceSyntax3() throws JSQLParserException {
 		assertEquals("col2", ((Column) replace.getColumns().get(1)).getColumnName());
 		assertEquals("col3", ((Column) replace.getColumns().get(2)).getColumnName());
 		assertTrue(replace.getItemsList() instanceof SubSelect);
-		//TODO:
-		//assertEquals(statement, ""+replace);
+		// TODO:
+		// assertEquals(statement, ""+replace);
 	}
 
 	public static void main(String[] args) {
diff --git a/testsrc/net/sf/jsqlparser/test/select/MemoryTest.java b/testsrc/net/sf/jsqlparser/test/select/MemoryTest.java
index e8c533c25..823d5a778 100644
--- a/testsrc/net/sf/jsqlparser/test/select/MemoryTest.java
+++ b/testsrc/net/sf/jsqlparser/test/select/MemoryTest.java
@@ -12,64 +12,64 @@ public static void main(String[] args) throws Exception {
 		System.out.println(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
 		CCJSqlParserManager parserManager = new CCJSqlParserManager();
 
-/*		String longQuery = new String(
-			"select  *  from  (  SELECT  intermediate.id  as  id  ,  intermediate.date  as          "
-				+ "date  FROM  (  SELECT  DISTINCT   (  id  )   FROM  (  SELECT                           "
-				+ "wct_workflows.workflow_id  as  id  ,  wct_transaction.date  as  date  FROM             "
-				+ "wct_audit_entry  ,  wct_transaction  ,  wct_workflows  WHERE                           "
-				+ "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 "
-				+ "'C'  )  and  wct_audit_entry.outcome  =  't'  and                                      "
-				+ "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 "
-				+ "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       "
-				+ "wct_workflows.active_version_id ))) UNION  SELECT  wct_workflows.workflow_id  as       "
-				+ "id  ,  wct_transaction.date  as  date  FROM  wct_audit_entry  ,                        "
-				+ "wct_transaction  ,  wct_workflows  WHERE  (  wct_audit_entry.privilege  =              "
-				+ "'W'  or  wct_audit_entry.privilege  =  'C'  )  and  wct_audit_entry.outcome            "
-				+ "=  't'  and  wct_audit_entry.transaction_id  =                                         "
-				+ "wct_transaction.transaction_id  and  wct_transaction.user_id  = 164 and                "
-				+ "afdf=  (  select  wct_audit_entry.object_id  from  wct_audit_entry  ,                  "
-				+ "wct_workflow_archive  where  wct_audit_entry.object_id  =                              "
-				+ "wct_workflow_archive.archive_id  and  wct_workflows.workflow_id  =                     "
-				+ "wct_workflow_archive.workflow_id  )                                                    "
-				+ "UNION  SELECT  wct_workflows.workflow_id                                               "
-				+ "as  id  ,  wct_transaction.date  as  date  FROM  wct_audit_entry  ,                    "
-				+ "wct_transaction  ,  wct_workflows  WHERE  (  wct_audit_entry.privilege  =              "
-				+ "'W'  OR  wct_audit_entry.privilege  =  'E'  OR  wct_audit_entry.privilege  =           "
-				+ "'A'  )  and  wct_audit_entry.outcome  =  't'  and                                      "
-				+ "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 "
-				+ "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       "
-				+ "wct_workflows.workflow_id    UNION SELECT * FROM interm2  ,  wct_workflow_docs  WHERE  "
-				+ "interm2.id  =  wct_workflow_docs.document_id  ORDER BY  id  ,  date  DESC              ");
-*/
+		/*
+		 * String longQuery = new String(
+		 * "select  *  from  (  SELECT  intermediate.id  as  id  ,  intermediate.date  as          " +
+		 * "date  FROM  (  SELECT  DISTINCT   (  id  )   FROM  (  SELECT                           " +
+		 * "wct_workflows.workflow_id  as  id  ,  wct_transaction.date  as  date  FROM             " +
+		 * "wct_audit_entry  ,  wct_transaction  ,  wct_workflows  WHERE                           " +
+		 * "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 " +
+		 * "'C'  )  and  wct_audit_entry.outcome  =  't'  and                                      " +
+		 * "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 " +
+		 * "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       " +
+		 * "wct_workflows.active_version_id ))) UNION  SELECT  wct_workflows.workflow_id  as       " +
+		 * "id  ,  wct_transaction.date  as  date  FROM  wct_audit_entry  ,                        " +
+		 * "wct_transaction  ,  wct_workflows  WHERE  (  wct_audit_entry.privilege  =              " +
+		 * "'W'  or  wct_audit_entry.privilege  =  'C'  )  and  wct_audit_entry.outcome            " +
+		 * "=  't'  and  wct_audit_entry.transaction_id  =                                         " +
+		 * "wct_transaction.transaction_id  and  wct_transaction.user_id  = 164 and                " +
+		 * "afdf=  (  select  wct_audit_entry.object_id  from  wct_audit_entry  ,                  " +
+		 * "wct_workflow_archive  where  wct_audit_entry.object_id  =                              " +
+		 * "wct_workflow_archive.archive_id  and  wct_workflows.workflow_id  =                     " +
+		 * "wct_workflow_archive.workflow_id  )                                                    " +
+		 * "UNION  SELECT  wct_workflows.workflow_id                                               " +
+		 * "as  id  ,  wct_transaction.date  as  date  FROM  wct_audit_entry  ,                    " +
+		 * "wct_transaction  ,  wct_workflows  WHERE  (  wct_audit_entry.privilege  =              " +
+		 * "'W'  OR  wct_audit_entry.privilege  =  'E'  OR  wct_audit_entry.privilege  =           " +
+		 * "'A'  )  and  wct_audit_entry.outcome  =  't'  and                                      " +
+		 * "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 " +
+		 * "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       " +
+		 * "wct_workflows.workflow_id    UNION SELECT * FROM interm2  ,  wct_workflow_docs  WHERE  " +
+		 * "interm2.id  =  wct_workflow_docs.document_id  ORDER BY  id  ,  date  DESC              ");
+		 */
 		String longQuery = new String("select * from k where ID > 4");
-		
-		
-		/*		String longQuery = "select  *  from  (  SELECT  intermediate.id  as  id  ,  intermediate.date  as          "
-						+ "date  FROM  (  SELECT  DISTINCT   (  id  )   FROM  (  SELECT                           "
-						+ "wct_workflows.workflow_id  as  id  ,  wct_transaction.date  as  date  FROM             "
-						+ "wct_audit_entry  ,  wct_transaction  ,  wct_workflows  WHERE                           "
-						+ "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 "
-						+ "'C'  ))))";
-*/
-/*		String longQuery = "select  *  from  d WHERE                           "
-				+ "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 "
-				+ "'C'  )  and  wct_audit_entry.outcome  =  't'  and                                      "
-				+ "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 "
-				+ "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       "
-				+ "wct_workflows.active_version_id ";
-*/
+
+		/*
+		 * String longQuery = "select  *  from  (  SELECT  intermediate.id  as  id  ,  intermediate.date  as          "
+		 * + "date  FROM  (  SELECT  DISTINCT   (  id  )   FROM  (  SELECT                           " +
+		 * "wct_workflows.workflow_id  as  id  ,  wct_transaction.date  as  date  FROM             " +
+		 * "wct_audit_entry  ,  wct_transaction  ,  wct_workflows  WHERE                           " +
+		 * "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 " + "'C'  ))))";
+		 */
+		/*
+		 * String longQuery = "select  *  from  d WHERE                           " +
+		 * "(  wct_audit_entry.privilege  =  'W'  or  wct_audit_entry.privilege  =                 " +
+		 * "'C'  )  and  wct_audit_entry.outcome  =  't'  and                                      " +
+		 * "wct_audit_entry.transaction_id  =  wct_transaction.transaction_id  and                 " +
+		 * "wct_transaction.user_id  = 164 and  wct_audit_entry.object_id  =                       " +
+		 * "wct_workflows.active_version_id ";
+		 */
 		StringReader stringReader = new StringReader(longQuery);
-	    Statement statement = parserManager.parse(stringReader);
-//		stringReader = new StringReader(longQuery);
-//		Statement statement2 = parserManager.parse(stringReader);
-//		stringReader = null;
-		//statement2 = null;
+		Statement statement = parserManager.parse(stringReader);
+		// stringReader = new StringReader(longQuery);
+		// Statement statement2 = parserManager.parse(stringReader);
+		// stringReader = null;
+		// statement2 = null;
 		statement = null;
 		parserManager = null;
 		longQuery = null;
 		System.gc();
 		System.out.println(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
 
-
 	}
 }
diff --git a/testsrc/net/sf/jsqlparser/test/select/SelectTest.java b/testsrc/net/sf/jsqlparser/test/select/SelectTest.java
index 8bab5cdf9..5751142b3 100644
--- a/testsrc/net/sf/jsqlparser/test/select/SelectTest.java
+++ b/testsrc/net/sf/jsqlparser/test/select/SelectTest.java
@@ -50,7 +50,7 @@ public void testLimit() throws JSQLParserException {
 
 		// toString uses standard syntax
 		statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT ? OFFSET 3";
-		assertEquals(statement, ""+select);
+		assertEquals(statement, "" + select);
 
 		statement = "SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?";
 		select = (Select) parserManager.parse(new StringReader(statement));
@@ -58,10 +58,9 @@ public void testLimit() throws JSQLParserException {
 		assertEquals(0, ((PlainSelect) select.getSelectBody()).getLimit().getRowCount());
 		assertTrue(((PlainSelect) select.getSelectBody()).getLimit().isOffsetJdbcParameter());
 		assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
-		assertEquals(statement, ""+select);
+		assertEquals(statement, "" + select);
 
-		statement =
-			"(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION "
+		statement = "(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION "
 				+ "(SELECT * FROM mytable2 WHERE mytable2.col = 9 OFFSET ?) LIMIT 3, 4";
 		select = (Select) parserManager.parse(new StringReader(statement));
 		Union union = (Union) select.getSelectBody();
@@ -69,19 +68,16 @@ public void testLimit() throws JSQLParserException {
 		assertEquals(4, union.getLimit().getRowCount());
 
 		// toString uses standard syntax
-		statement =
-			"(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION "
+		statement = "(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION "
 				+ "(SELECT * FROM mytable2 WHERE mytable2.col = 9 OFFSET ?) LIMIT 4 OFFSET 3";
-		assertEquals(statement, ""+select);
+		assertEquals(statement, "" + select);
 
-		statement =
-			"(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION ALL "
-			+ "(SELECT * FROM mytable2 WHERE mytable2.col = 9 OFFSET ?) UNION ALL "
-			+ "(SELECT * FROM mytable3 WHERE mytable4.col = 9 OFFSET ?) LIMIT 4 OFFSET 3";
+		statement = "(SELECT * FROM mytable WHERE mytable.col = 9 OFFSET ?) UNION ALL "
+				+ "(SELECT * FROM mytable2 WHERE mytable2.col = 9 OFFSET ?) UNION ALL "
+				+ "(SELECT * FROM mytable3 WHERE mytable4.col = 9 OFFSET ?) LIMIT 4 OFFSET 3";
 		select = (Select) parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+select);
+		assertEquals(statement, "" + select);
 
-	
 	}
 
 	public void testTop() throws JSQLParserException {
@@ -90,101 +86,101 @@ public void testTop() throws JSQLParserException {
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 
 		assertEquals(3, ((PlainSelect) select.getSelectBody()).getTop().getRowCount());
-		
+
 		statement = "select top 5 foo from bar";
 		select = (Select) parserManager.parse(new StringReader(statement));
 		assertEquals(5, ((PlainSelect) select.getSelectBody()).getTop().getRowCount());
-		
 
 	}
 
-	
 	public void testSelectItems() throws JSQLParserException {
-		String statement =
-			"SELECT myid AS MYID, mycol, tab.*, schema.tab.*, mytab.mycol2, myschema.mytab.mycol, myschema.mytab.* FROM mytable WHERE mytable.col = 9";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		String statement = "SELECT myid AS MYID, mycol, tab.*, schema.tab.*, mytab.mycol2, myschema.mytab.mycol, myschema.mytab.* FROM mytable WHERE mytable.col = 9";
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 
 		assertEquals("MYID", ((SelectExpressionItem) plainSelect.getSelectItems().get(0)).getAlias());
-		assertEquals("mycol", ((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).getColumnName());
+		assertEquals("mycol",
+				((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).getColumnName());
 		assertEquals("tab", ((AllTableColumns) plainSelect.getSelectItems().get(2)).getTable().getName());
 		assertEquals("schema", ((AllTableColumns) plainSelect.getSelectItems().get(3)).getTable().getSchemaName());
-		assertEquals("schema.tab", ((AllTableColumns) plainSelect.getSelectItems().get(3)).getTable().getWholeTableName());
-		assertEquals(
-			"mytab.mycol2",
-			((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(4)).getExpression()).getWholeColumnName());
-		assertEquals(
-			"myschema.mytab.mycol",
-			((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(5)).getExpression()).getWholeColumnName());
-		assertEquals("myschema.mytab", ((AllTableColumns) plainSelect.getSelectItems().get(6)).getTable().getWholeTableName());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals("schema.tab", ((AllTableColumns) plainSelect.getSelectItems().get(3)).getTable()
+				.getWholeTableName());
+		assertEquals("mytab.mycol2",
+				((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(4)).getExpression())
+						.getWholeColumnName());
+		assertEquals("myschema.mytab.mycol",
+				((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(5)).getExpression())
+						.getWholeColumnName());
+		assertEquals("myschema.mytab", ((AllTableColumns) plainSelect.getSelectItems().get(6)).getTable()
+				.getWholeTableName());
+		assertEquals(statement, "" + plainSelect);
 
 		statement = "SELECT myid AS MYID, (SELECT MAX(ID) AS myid2 FROM mytable2) AS myalias FROM mytable WHERE mytable.col = 9";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals("myalias", ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getAlias());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 
 		statement = "SELECT (myid + myid2) AS MYID FROM mytable WHERE mytable.col = 9";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals("MYID", ((SelectExpressionItem) plainSelect.getSelectItems().get(0)).getAlias());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testUnion() throws JSQLParserException {
-		String statement =
-			"SELECT * FROM mytable WHERE mytable.col = 9 UNION "
-				+ "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION "
-				+ "SELECT * FROM mytable2 LIMIT 3,4";
-		
+		String statement = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
+				+ "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION " + "SELECT * FROM mytable2 LIMIT 3,4";
+
 		Union union = (Union) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(3, union.getPlainSelects().size());
 		assertEquals("mytable", ((Table) ((PlainSelect) union.getPlainSelects().get(0)).getFromItem()).getName());
 		assertEquals("mytable3", ((Table) ((PlainSelect) union.getPlainSelects().get(1)).getFromItem()).getName());
 		assertEquals("mytable2", ((Table) ((PlainSelect) union.getPlainSelects().get(2)).getFromItem()).getName());
 		assertEquals(3, ((PlainSelect) union.getPlainSelects().get(2)).getLimit().getOffset());
-		
-		//use brakets for toString
-		//use standard limit syntax
-		String statementToString =
-			"(SELECT * FROM mytable WHERE mytable.col = 9) UNION "
+
+		// use brakets for toString
+		// use standard limit syntax
+		String statementToString = "(SELECT * FROM mytable WHERE mytable.col = 9) UNION "
 				+ "(SELECT * FROM mytable3 WHERE mytable3.col = ?) UNION "
 				+ "(SELECT * FROM mytable2 LIMIT 4 OFFSET 3)";
-		assertEquals(statementToString, ""+union);
+		assertEquals(statementToString, "" + union);
 	}
 
 	public void testDistinct() throws JSQLParserException {
 		String statement = "SELECT DISTINCT ON (myid) myid, mycol FROM mytable WHERE mytable.col = 9";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
-		assertEquals(
-			"myid",
-			((Column) ((SelectExpressionItem) plainSelect.getDistinct().getOnSelectItems().get(0)).getExpression()).getColumnName());
-		assertEquals("mycol", ((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).getColumnName());
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
+		assertEquals("myid",
+				((Column) ((SelectExpressionItem) plainSelect.getDistinct().getOnSelectItems().get(0)).getExpression())
+						.getColumnName());
+		assertEquals("mycol",
+				((Column) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).getColumnName());
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 	}
 
 	public void testFrom() throws JSQLParserException {
-		String statement =
-			"SELECT * FROM mytable as mytable0, mytable1 alias_tab1, mytable2 as alias_tab2, (SELECT * FROM mytable3) AS mytable4 WHERE mytable.col = 9";
-		String statementToString =
-			"SELECT * FROM mytable as mytable0, mytable1 as alias_tab1, mytable2 as alias_tab2, (SELECT * FROM mytable3) AS mytable4 WHERE mytable.col = 9";
+		String statement = "SELECT * FROM mytable as mytable0, mytable1 alias_tab1, mytable2 as alias_tab2, (SELECT * FROM mytable3) AS mytable4 WHERE mytable.col = 9";
+		String statementToString = "SELECT * FROM mytable as mytable0, mytable1 as alias_tab1, mytable2 as alias_tab2, (SELECT * FROM mytable3) AS mytable4 WHERE mytable.col = 9";
 
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		assertEquals(3, plainSelect.getJoins().size());
 		assertEquals("mytable0", ((Table) plainSelect.getFromItem()).getAlias());
 		assertEquals("alias_tab1", ((Join) plainSelect.getJoins().get(0)).getRightItem().getAlias());
 		assertEquals("alias_tab2", ((Join) plainSelect.getJoins().get(1)).getRightItem().getAlias());
 		assertEquals("mytable4", ((Join) plainSelect.getJoins().get(2)).getRightItem().getAlias());
 		assertEquals(statementToString.toUpperCase(), plainSelect.toString().toUpperCase());
-		
+
 	}
 
 	public void testJoin() throws JSQLParserException {
 		String statement = "SELECT * FROM tab1 LEFT outer JOIN tab2 ON tab1.id = tab2.id";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		assertEquals(1, plainSelect.getJoins().size());
 		assertEquals("tab2", ((Table) ((Join) plainSelect.getJoins().get(0)).getRightItem()).getWholeTableName());
-		assertEquals(
-			"tab1.id",
-			((Column) ((EqualsTo) ((Join) plainSelect.getJoins().get(0)).getOnExpression()).getLeftExpression()).getWholeColumnName());
+		assertEquals("tab1.id",
+				((Column) ((EqualsTo) ((Join) plainSelect.getJoins().get(0)).getOnExpression()).getLeftExpression())
+						.getWholeColumnName());
 		assertTrue(((Join) plainSelect.getJoins().get(0)).isOuter());
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 
@@ -200,23 +196,24 @@ public void testJoin() throws JSQLParserException {
 		assertEquals(2, plainSelect.getJoins().size());
 		assertEquals("tab3", ((Table) ((Join) plainSelect.getJoins().get(1)).getRightItem()).getWholeTableName());
 		assertFalse(((Join) plainSelect.getJoins().get(1)).isOuter());
-		
-		// implicit INNER 
+
+		// implicit INNER
 		statement = "SELECT * FROM tab1 LEFT outer JOIN tab2 ON tab1.id = tab2.id INNER JOIN tab3";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 
-		statement= "SELECT * FROM TA2 LEFT outer JOIN O USING (col1, col2) where D.OasSD = 'asdf' And (kj >= 4 OR l < 'sdf')";
+		statement = "SELECT * FROM TA2 LEFT outer JOIN O USING (col1, col2) where D.OasSD = 'asdf' And (kj >= 4 OR l < 'sdf')";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
-		
+
 		statement = "SELECT * FROM tab1 INNER JOIN tab2 USING (id, id2)";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(1, plainSelect.getJoins().size());
 		assertEquals("tab2", ((Table) ((Join) plainSelect.getJoins().get(0)).getRightItem()).getWholeTableName());
 		assertFalse(((Join) plainSelect.getJoins().get(0)).isOuter());
 		assertEquals(2, ((Join) plainSelect.getJoins().get(0)).getUsingColumns().size());
-		assertEquals("id2", ((Column) ((Join) plainSelect.getJoins().get(0)).getUsingColumns().get(1)).getWholeColumnName());
+		assertEquals("id2",
+				((Column) ((Join) plainSelect.getJoins().get(0)).getUsingColumns().get(1)).getWholeColumnName());
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 
 		statement = "SELECT * FROM tab1 RIGHT OUTER JOIN tab2 USING (id, id2)";
@@ -241,11 +238,13 @@ public void testFunctions() throws JSQLParserException {
 		assertEquals(statement.toUpperCase(), select.toString().toUpperCase());
 
 		statement = "SELECT MAX(a, b, c), COUNT(*), D FROM tab1 GROUP BY D";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		Function fun = (Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(0)).getExpression();
 		assertEquals("MAX", fun.getName());
-		assertEquals("b", ((Column)fun.getParameters().getExpressions().get(1)).getWholeColumnName());
-		assertTrue(((Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).isAllColumns());
+		assertEquals("b", ((Column) fun.getParameters().getExpressions().get(1)).getWholeColumnName());
+		assertTrue(((Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression())
+				.isAllColumns());
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 
 		statement = "SELECT {fn MAX(a, b, c)}, COUNT(*), D FROM tab1 GROUP BY D";
@@ -253,15 +252,16 @@ public void testFunctions() throws JSQLParserException {
 		fun = (Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(0)).getExpression();
 		assertTrue(fun.isEscaped());
 		assertEquals("MAX", fun.getName());
-		assertEquals("b", ((Column)fun.getParameters().getExpressions().get(1)).getWholeColumnName());
-		assertTrue(((Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression()).isAllColumns());
+		assertEquals("b", ((Column) fun.getParameters().getExpressions().get(1)).getWholeColumnName());
+		assertTrue(((Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression())
+				.isAllColumns());
 		assertEquals(statement.toUpperCase(), plainSelect.toString().toUpperCase());
 
 		statement = "SELECT ab.MAX(a, b, c), cd.COUNT(*), D FROM tab1 GROUP BY D";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		fun = (Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(0)).getExpression();
 		assertEquals("ab.MAX", fun.getName());
-		assertEquals("b", ((Column)fun.getParameters().getExpressions().get(1)).getWholeColumnName());
+		assertEquals("b", ((Column) fun.getParameters().getExpressions().get(1)).getWholeColumnName());
 		fun = (Function) ((SelectExpressionItem) plainSelect.getSelectItems().get(1)).getExpression();
 		assertEquals("cd.COUNT", fun.getName());
 		assertTrue(fun.isAllColumns());
@@ -273,10 +273,11 @@ public void testWhere() throws JSQLParserException {
 
 		String statement = "SELECT * FROM tab1 WHERE ";
 		String whereToString = "(a + b + c / d + e * f) * (a / b * (a + b)) > ?";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement
+				+ whereToString))).getSelectBody();
 		assertTrue(plainSelect.getWhere() instanceof GreaterThan);
 		assertTrue(((GreaterThan) plainSelect.getWhere()).getLeftExpression() instanceof Multiplication);
-		assertEquals(statement+whereToString, ""+plainSelect);
+		assertEquals(statement + whereToString, "" + plainSelect);
 
 		ExpressionDeParser expressionDeParser = new ExpressionDeParser();
 		StringBuffer stringBuffer = new StringBuffer();
@@ -285,65 +286,71 @@ public void testWhere() throws JSQLParserException {
 		assertEquals(whereToString, stringBuffer.toString());
 
 		whereToString = "(7 * s + 9 / 3) NOT BETWEEN 3 AND ?";
-		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString))).getSelectBody();
+		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString)))
+				.getSelectBody();
 
 		stringBuffer = new StringBuffer();
 		expressionDeParser.setBuffer(stringBuffer);
 		plainSelect.getWhere().accept(expressionDeParser);
 
 		assertEquals(whereToString, stringBuffer.toString());
-		assertEquals(statement+whereToString, ""+plainSelect);
+		assertEquals(statement + whereToString, "" + plainSelect);
 
 		whereToString = "a / b NOT IN (?, 's''adf', 234.2)";
-		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString))).getSelectBody();
+		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString)))
+				.getSelectBody();
 
 		stringBuffer = new StringBuffer();
 		expressionDeParser.setBuffer(stringBuffer);
 		plainSelect.getWhere().accept(expressionDeParser);
 
 		assertEquals(whereToString, stringBuffer.toString());
-		assertEquals(statement+whereToString, ""+plainSelect);
+		assertEquals(statement + whereToString, "" + plainSelect);
 
 		whereToString = "NOT 0 = 0";
-		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString))).getSelectBody();
+		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString)))
+				.getSelectBody();
 
 		String where = " NOT (0 = 0)";
 		whereToString = "NOT (0 = 0)";
-		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString))).getSelectBody();
+		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString)))
+				.getSelectBody();
 
 		stringBuffer = new StringBuffer();
 		expressionDeParser.setBuffer(stringBuffer);
 		plainSelect.getWhere().accept(expressionDeParser);
 
 		assertEquals(where, stringBuffer.toString());
-		assertEquals(statement+whereToString, ""+plainSelect);
+		assertEquals(statement + whereToString, "" + plainSelect);
 	}
 
 	public void testGroupBy() throws JSQLParserException {
 		String statement = "SELECT * FROM tab1 WHERE a > 34 GROUP BY tab1.b";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		assertEquals(1, plainSelect.getGroupByColumnReferences().size());
 		assertEquals("tab1.b", ((Column) plainSelect.getGroupByColumnReferences().get(0)).getWholeColumnName());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 
 		statement = "SELECT * FROM tab1 WHERE a > 34 GROUP BY 2, 3";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(2, plainSelect.getGroupByColumnReferences().size());
 		assertEquals(2, ((LongValue) plainSelect.getGroupByColumnReferences().get(0)).getValue());
 		assertEquals(3, ((LongValue) plainSelect.getGroupByColumnReferences().get(1)).getValue());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testHaving() throws JSQLParserException {
 		String statement = "SELECT MAX(tab1.b) FROM tab1 WHERE a > 34 GROUP BY tab1.b HAVING MAX(tab1.b) > 56";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		assertTrue(plainSelect.getHaving() instanceof GreaterThan);
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 
 		statement = "SELECT MAX(tab1.b) FROM tab1 WHERE a > 34 HAVING MAX(tab1.b) IN (56, 32, 3, ?)";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertTrue(plainSelect.getHaving() instanceof InExpression);
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testExists() throws JSQLParserException {
@@ -351,9 +358,9 @@ public void testExists() throws JSQLParserException {
 		String where = " EXISTS (SELECT * FROM tab2)";
 		statement += where;
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
-		PlainSelect plainSelect =	(PlainSelect) ((Select) parsed).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parsed).getSelectBody();
 		ExpressionDeParser expressionDeParser = new ExpressionDeParser();
 		StringBuffer stringBuffer = new StringBuffer();
 		expressionDeParser.setBuffer(stringBuffer);
@@ -365,17 +372,21 @@ public void testExists() throws JSQLParserException {
 	}
 
 	public void testOrderBy() throws JSQLParserException {
-		//TODO: should there be a DESC marker in the OrderByElement class?
+		// TODO: should there be a DESC marker in the OrderByElement class?
 		String statement = "SELECT * FROM tab1 WHERE a > 34 GROUP BY tab1.b ORDER BY tab1.a DESC, tab1.b ASC";
 		String statementToString = "SELECT * FROM tab1 WHERE a > 34 GROUP BY tab1.b ORDER BY tab1.a DESC, tab1.b";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
 		assertEquals(2, plainSelect.getOrderByElements().size());
-		assertEquals("tab1.a", ((Column) ((OrderByElement) plainSelect.getOrderByElements().get(0)).getExpression()).getWholeColumnName());
-		assertEquals("b", ((Column) ((OrderByElement) plainSelect.getOrderByElements().get(1)).getExpression()).getColumnName());
+		assertEquals("tab1.a",
+				((Column) ((OrderByElement) plainSelect.getOrderByElements().get(0)).getExpression())
+						.getWholeColumnName());
+		assertEquals("b",
+				((Column) ((OrderByElement) plainSelect.getOrderByElements().get(1)).getExpression()).getColumnName());
 		assertTrue(((OrderByElement) plainSelect.getOrderByElements().get(1)).isAsc());
 		assertFalse(((OrderByElement) plainSelect.getOrderByElements().get(0)).isAsc());
-		assertEquals(statementToString, ""+plainSelect);
-		
+		assertEquals(statementToString, "" + plainSelect);
+
 		ExpressionDeParser expressionDeParser = new ExpressionDeParser();
 		StringBuffer stringBuffer = new StringBuffer();
 		SelectDeParser deParser = new SelectDeParser(expressionDeParser, stringBuffer);
@@ -383,201 +394,196 @@ public void testOrderBy() throws JSQLParserException {
 		expressionDeParser.setBuffer(stringBuffer);
 		plainSelect.accept(deParser);
 		assertEquals(statement, stringBuffer.toString());
-		
+
 		statement = "SELECT * FROM tab1 WHERE a > 34 GROUP BY tab1.b ORDER BY tab1.a, 2";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
 		assertEquals(2, plainSelect.getOrderByElements().size());
-		assertEquals("a", ((Column) ((OrderByElement) plainSelect.getOrderByElements().get(0)).getExpression()).getColumnName());
-		assertEquals(2, ((LongValue) ((OrderByElement) plainSelect.getOrderByElements().get(1)).getExpression()).getValue());
-		assertEquals(statement, ""+plainSelect);
+		assertEquals("a",
+				((Column) ((OrderByElement) plainSelect.getOrderByElements().get(0)).getExpression()).getColumnName());
+		assertEquals(2,
+				((LongValue) ((OrderByElement) plainSelect.getOrderByElements().get(1)).getExpression()).getValue());
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testTimestamp() throws JSQLParserException {
 		String statement = "SELECT * FROM tab1 WHERE a > {ts '2004-04-30 04:05:34.56'}";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
-		assertEquals("2004-04-30 04:05:34.56", ((TimestampValue)((GreaterThan) plainSelect.getWhere()).getRightExpression()).getValue().toString());
-		assertEquals(statement, ""+plainSelect);
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
+		assertEquals("2004-04-30 04:05:34.56",
+				((TimestampValue) ((GreaterThan) plainSelect.getWhere()).getRightExpression()).getValue().toString());
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testTime() throws JSQLParserException {
 		String statement = "SELECT * FROM tab1 WHERE a > {t '04:05:34'}";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
-		assertEquals("04:05:34", (((TimeValue)((GreaterThan) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
-		assertEquals(statement, ""+plainSelect);
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
+		assertEquals("04:05:34",
+				(((TimeValue) ((GreaterThan) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testCase() throws JSQLParserException {
 		String statement = "SELECT a, CASE b WHEN 1 THEN 2 END FROM tab1";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
 		statement = "SELECT a, (CASE WHEN (a > 2) THEN 3 END) AS b FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
 		statement = "SELECT a, (CASE WHEN a > 2 THEN 3 ELSE 4 END) AS b FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
-		
 		statement = "SELECT a, (CASE b WHEN 1 THEN 2 WHEN 3 THEN 4 ELSE 5 END) FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
-		
-		statement = "SELECT a, (CASE " +
-				"WHEN b > 1 THEN 'BBB' " +
-				"WHEN a = 3 THEN 'AAA' " +
-				"END) FROM tab1";
+		assertEquals(statement, "" + parsed);
+
+		statement = "SELECT a, (CASE " + "WHEN b > 1 THEN 'BBB' " + "WHEN a = 3 THEN 'AAA' " + "END) FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
-		
-		statement = "SELECT a, (CASE " +
-		"WHEN b > 1 THEN 'BBB' " +
-		"WHEN a = 3 THEN 'AAA' " +
-		"END) FROM tab1 " +
-		"WHERE c = (CASE " +
-		"WHEN d <> 3 THEN 5 " +
-		"ELSE 10 " +
-		"END)";
+		assertEquals(statement, "" + parsed);
+
+		statement = "SELECT a, (CASE " + "WHEN b > 1 THEN 'BBB' " + "WHEN a = 3 THEN 'AAA' " + "END) FROM tab1 "
+				+ "WHERE c = (CASE " + "WHEN d <> 3 THEN 5 " + "ELSE 10 " + "END)";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
-		statement = "SELECT a, CASE a " +
-		"WHEN 'b' THEN 'BBB' " +
-		"WHEN 'a' THEN 'AAA' " +
-		"END AS b FROM tab1";
+		statement = "SELECT a, CASE a " + "WHEN 'b' THEN 'BBB' " + "WHEN 'a' THEN 'AAA' " + "END AS b FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
 		statement = "SELECT a FROM tab1 WHERE CASE b WHEN 1 THEN 2 WHEN 3 THEN 4 ELSE 5 END > 34";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 
 		statement = "SELECT a FROM tab1 WHERE CASE b WHEN 1 THEN 2 + 3 ELSE 4 END > 34";
 		parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
-
-		
-		
-		statement = "SELECT a, (CASE " +
-		"WHEN (CASE a WHEN 1 THEN 10 ELSE 20 END) > 15 THEN 'BBB' " +
-//		"WHEN (SELECT c FROM tab2 WHERE d = 2) = 3 THEN 'AAA' " +
-		"END) FROM tab1";
+		assertEquals(statement, "" + parsed);
+
+		statement = "SELECT a, (CASE " + "WHEN (CASE a WHEN 1 THEN 10 ELSE 20 END) > 15 THEN 'BBB' " +
+		// "WHEN (SELECT c FROM tab2 WHERE d = 2) = 3 THEN 'AAA' " +
+				"END) FROM tab1";
 		parsed = parserManager.parse(new StringReader(statement));
-		//System.out.println(""+statement);
-		//System.out.println(""+parsed);
-		assertEquals(statement, ""+parsed);
-		
-		
+		// System.out.println(""+statement);
+		// System.out.println(""+parsed);
+		assertEquals(statement, "" + parsed);
+
 	}
 
 	public void testReplaceAsFunction() throws JSQLParserException {
 		String statement = "SELECT REPLACE(a, 'b', c) FROM tab1";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 	}
 
 	public void testLike() throws JSQLParserException {
 		String statement = "SELECT * FROM tab1 WHERE a LIKE 'test'";
-		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
-		assertEquals("test", (((StringValue)((LikeExpression) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
-		assertEquals(statement, ""+plainSelect);
+		PlainSelect plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement)))
+				.getSelectBody();
+		assertEquals("test",
+				(((StringValue) ((LikeExpression) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
+		assertEquals(statement, "" + plainSelect);
 
 		statement = "SELECT * FROM tab1 WHERE a LIKE 'test' ESCAPE 'test2'";
 		plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement))).getSelectBody();
-		assertEquals("test", (((StringValue)((LikeExpression) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
+		assertEquals("test",
+				(((StringValue) ((LikeExpression) plainSelect.getWhere()).getRightExpression()).getValue()).toString());
 		assertEquals("test2", (((LikeExpression) plainSelect.getWhere()).getEscape()));
-		assertEquals(statement, ""+plainSelect);
+		assertEquals(statement, "" + plainSelect);
 	}
 
 	public void testSelectOrderHaving() throws JSQLParserException {
 		String statement = "SELECT units, count(units) AS num FROM currency GROUP BY units HAVING count(units) > 1 ORDER BY num";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 	}
 
 	public void testDouble() throws JSQLParserException {
 		String statement = "SELECT 1e2, * FROM mytable WHERE mytable.col = 9";
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 
-		assertEquals(1e2, ((DoubleValue)((SelectExpressionItem)((PlainSelect) select.getSelectBody()).getSelectItems().get(0)).getExpression()).getValue(), 0);
+		assertEquals(1e2, ((DoubleValue) ((SelectExpressionItem) ((PlainSelect) select.getSelectBody())
+				.getSelectItems().get(0)).getExpression()).getValue(), 0);
 
 		statement = "SELECT * FROM mytable WHERE mytable.col = 1.e2";
 		select = (Select) parserManager.parse(new StringReader(statement));
 
-		assertEquals(1e2, ((DoubleValue)((BinaryExpression)((PlainSelect) select.getSelectBody()).getWhere()).getRightExpression()).getValue(), 0);
+		assertEquals(1e2,
+				((DoubleValue) ((BinaryExpression) ((PlainSelect) select.getSelectBody()).getWhere())
+						.getRightExpression()).getValue(), 0);
 
 		statement = "SELECT * FROM mytable WHERE mytable.col = 1.2e2";
 		select = (Select) parserManager.parse(new StringReader(statement));
 
-		assertEquals(1.2e2, ((DoubleValue)((BinaryExpression)((PlainSelect) select.getSelectBody()).getWhere()).getRightExpression()).getValue(), 0);
+		assertEquals(1.2e2,
+				((DoubleValue) ((BinaryExpression) ((PlainSelect) select.getSelectBody()).getWhere())
+						.getRightExpression()).getValue(), 0);
 
 		statement = "SELECT * FROM mytable WHERE mytable.col = 2e2";
 		select = (Select) parserManager.parse(new StringReader(statement));
 
-		assertEquals(2e2, ((DoubleValue)((BinaryExpression)((PlainSelect) select.getSelectBody()).getWhere()).getRightExpression()).getValue(), 0);
+		assertEquals(2e2,
+				((DoubleValue) ((BinaryExpression) ((PlainSelect) select.getSelectBody()).getWhere())
+						.getRightExpression()).getValue(), 0);
 	}
 
-
 	public void testWith() throws JSQLParserException {
-		String statement = "WITH DINFO (DEPTNO, AVGSALARY, EMPCOUNT) AS " + 
-							"(SELECT OTHERS.WORKDEPT, AVG(OTHERS.SALARY), COUNT(*) FROM EMPLOYEE AS OTHERS " +
-							"GROUP BY OTHERS.WORKDEPT), DINFOMAX AS (SELECT MAX(AVGSALARY) AS AVGMAX FROM DINFO) " +
-							"SELECT THIS_EMP.EMPNO, THIS_EMP.SALARY, DINFO.AVGSALARY, DINFO.EMPCOUNT, DINFOMAX.AVGMAX " +
-							"FROM EMPLOYEE AS THIS_EMP INNER JOIN DINFO INNER JOIN DINFOMAX " +
-							"WHERE THIS_EMP.JOB = 'SALESREP' AND THIS_EMP.WORKDEPT = DINFO.DEPTNO";
+		String statement = "WITH DINFO (DEPTNO, AVGSALARY, EMPCOUNT) AS "
+				+ "(SELECT OTHERS.WORKDEPT, AVG(OTHERS.SALARY), COUNT(*) FROM EMPLOYEE AS OTHERS "
+				+ "GROUP BY OTHERS.WORKDEPT), DINFOMAX AS (SELECT MAX(AVGSALARY) AS AVGMAX FROM DINFO) "
+				+ "SELECT THIS_EMP.EMPNO, THIS_EMP.SALARY, DINFO.AVGSALARY, DINFO.EMPCOUNT, DINFOMAX.AVGMAX "
+				+ "FROM EMPLOYEE AS THIS_EMP INNER JOIN DINFO INNER JOIN DINFOMAX "
+				+ "WHERE THIS_EMP.JOB = 'SALESREP' AND THIS_EMP.WORKDEPT = DINFO.DEPTNO";
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 	}
-	
+
 	public void testSelectAliasInQuotes() throws JSQLParserException {
 		String statement = "SELECT mycolumn AS \"My Column Name\" FROM mytable";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		assertEquals(statement, ""+parsed);
+		assertEquals(statement, "" + parsed);
 	}
-	
-	
+
 	public void testSelectJoinWithComma() throws JSQLParserException {
-	String statement = "SELECT cb.Genus, cb.Species FROM Coleccion_de_Briofitas AS cb, unigeoestados AS es " +
-    				"WHERE es.nombre = \"Tamaulipas\" AND cb.the_geom = es.geom";
-	Statement parsed = parserManager.parse(new StringReader(statement));
-	assertEquals(statement, ""+parsed);
+		String statement = "SELECT cb.Genus, cb.Species FROM Coleccion_de_Briofitas AS cb, unigeoestados AS es "
+				+ "WHERE es.nombre = \"Tamaulipas\" AND cb.the_geom = es.geom";
+		Statement parsed = parserManager.parse(new StringReader(statement));
+		assertEquals(statement, "" + parsed);
 	}
-	
+
 	public void testDeparser() throws JSQLParserException {
-		String statement = "SELECT a.OWNERLASTNAME, a.OWNERFIRSTNAME "
-							+"FROM ANTIQUEOWNERS AS a, ANTIQUES AS b "
-							+"WHERE b.BUYERID = a.OWNERID AND b.ITEM = 'Chair'";
+		String statement = "SELECT a.OWNERLASTNAME, a.OWNERFIRSTNAME " + "FROM ANTIQUEOWNERS AS a, ANTIQUES AS b "
+				+ "WHERE b.BUYERID = a.OWNERID AND b.ITEM = 'Chair'";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, deParser.getBuffer().toString());
-		
+
 		statement = "SELECT count(DISTINCT f + 4) FROM a";
 		parsed = parserManager.parse(new StringReader(statement));
-		deParser=new StatementDeParser(new StringBuffer());
+		deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 
 		statement = "SELECT count(DISTINCT f, g, h) FROM a";
 		parsed = parserManager.parse(new StringReader(statement));
-		deParser=new StatementDeParser(new StringBuffer());
+		deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
-	
+
 	public void testMysqlQuote() throws JSQLParserException {
-		String statement = "SELECT `a.OWNERLASTNAME`, `OWNERFIRSTNAME` "
-							+"FROM `ANTIQUEOWNERS` AS a, ANTIQUES AS b "
-							+"WHERE b.BUYERID = a.OWNERID AND b.ITEM = 'Chair'";
+		String statement = "SELECT `a.OWNERLASTNAME`, `OWNERFIRSTNAME` " + "FROM `ANTIQUEOWNERS` AS a, ANTIQUES AS b "
+				+ "WHERE b.BUYERID = a.OWNERID AND b.ITEM = 'Chair'";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
@@ -585,9 +591,9 @@ public void testMysqlQuote() throws JSQLParserException {
 	public void testConcat() throws JSQLParserException {
 		String statement = "SELECT a || b || c + 4 FROM t";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
@@ -595,39 +601,34 @@ public void testConcat() throws JSQLParserException {
 	public void testMatches() throws JSQLParserException {
 		String statement = "SELECT * FROM team WHERE team.search_column @@ to_tsquery('new & york & yankees')";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
 
 	public void testGroupByExpression() throws JSQLParserException {
-		String statement = 
-		"SELECT col1, col2, col1 + col2, sum(col8)" +
-		" FROM table1 " +
-		"GROUP BY col1, col2, col1 + col2";
+		String statement = "SELECT col1, col2, col1 + col2, sum(col8)" + " FROM table1 "
+				+ "GROUP BY col1, col2, col1 + col2";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
 
 	public void testBitwise() throws JSQLParserException {
-		String statement = 
-		"SELECT col1 & 32, col2 ^ col1, col1 | col2" +
-		" FROM table1";
+		String statement = "SELECT col1 & 32, col2 ^ col1, col1 | col2" + " FROM table1";
 		Statement parsed = parserManager.parse(new StringReader(statement));
-		StatementDeParser deParser=new StatementDeParser(new StringBuffer());
+		StatementDeParser deParser = new StatementDeParser(new StringBuffer());
 		parsed.accept(deParser);
-		
+
 		assertEquals(statement, parsed.toString());
 		assertEquals(statement, deParser.getBuffer().toString());
 	}
 
-	
 	public static void main(String[] args) {
 		junit.swingui.TestRunner.run(SelectTest.class);
 	}
diff --git a/testsrc/net/sf/jsqlparser/test/select/SpeedTest.java b/testsrc/net/sf/jsqlparser/test/select/SpeedTest.java
index 3ab736451..9aa7d7667 100644
--- a/testsrc/net/sf/jsqlparser/test/select/SpeedTest.java
+++ b/testsrc/net/sf/jsqlparser/test/select/SpeedTest.java
@@ -84,7 +84,7 @@ public void testSpeed() throws Exception {
 		TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
 		ArrayList parsedSelects = new ArrayList(NUM_REPS * statementsList.size());
 		long time = System.currentTimeMillis();
-		
+
 		// measure the time to parse NUM_REPS times all statements in the 2 files
 		for (int i = 0; i < NUM_REPS; i++) {
 			try {
@@ -108,8 +108,8 @@ public void testSpeed() throws Exception {
 		df.setMaximumFractionDigits(7);
 		df.setMinimumFractionDigits(4);
 		System.out.println(numTests + " statements parsed in " + elapsedTime + " milliseconds");
-		System.out.println(" (" +
-			statementsPerSecond + " statements per second,  " + df.format(1.0 / statementsPerSecond) + " seconds per statement )");
+		System.out.println(" (" + statementsPerSecond + " statements per second,  "
+				+ df.format(1.0 / statementsPerSecond) + " seconds per statement )");
 
 		numTests = 0;
 		time = System.currentTimeMillis();
@@ -124,11 +124,8 @@ public void testSpeed() throws Exception {
 		elapsedTime = System.currentTimeMillis() - time;
 		statementsPerSecond = numTests * 1000 / elapsedTime;
 		System.out.println(numTests + " select scans for table name executed in " + elapsedTime + " milliseconds");
-		System.out.println(" (" +
-			statementsPerSecond
-				+ " select scans for table name per second,  "
-				+ df.format(1.0 / statementsPerSecond)
-				+ " seconds per select scans for table name)");
+		System.out.println(" (" + statementsPerSecond + " select scans for table name per second,  "
+				+ df.format(1.0 / statementsPerSecond) + " seconds per select scans for table name)");
 
 	}
 
diff --git a/testsrc/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java b/testsrc/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java
index 6db1beec0..f60a65ded 100644
--- a/testsrc/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java
+++ b/testsrc/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java
@@ -30,9 +30,9 @@ public void testParse() throws Exception {
 				statement = CCJSqlParserManagerTest.getStatement(in);
 				if (statement == null)
 					break;
-					
+
 				Statement parsedStm = parserManager.parse(new StringReader(statement));
-				//System.out.println(statement);
+				// System.out.println(statement);
 			} catch (JSQLParserException e) {
 				throw new TestException("impossible to parse statement: " + statement, e);
 			}
@@ -66,7 +66,8 @@ public static String getLine(BufferedReader in) throws Exception {
 			line = in.readLine();
 			if (line != null) {
 				line.trim();
-//				if ((line.length() != 0) && ((line.length() < 2) ||  (line.length() >= 2) && !(line.charAt(0) == '/' && line.charAt(1) == '/')))
+				// if ((line.length() != 0) && ((line.length() < 2) || (line.length() >= 2) && !(line.charAt(0) == '/'
+				// && line.charAt(1) == '/')))
 				if (((line.length() < 2) || (line.length() >= 2) && !(line.charAt(0) == '/' && line.charAt(1) == '/')))
 					break;
 			} else {
diff --git a/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinder.java b/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinder.java
index 68982d308..3ea0a3323 100644
--- a/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinder.java
+++ b/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinder.java
@@ -69,7 +69,7 @@ public List getTableList(Select select) {
 
 	public void visit(PlainSelect plainSelect) {
 		plainSelect.getFromItem().accept(this);
-		
+
 		if (plainSelect.getJoins() != null) {
 			for (Iterator joinsIt = plainSelect.getJoins().iterator(); joinsIt.hasNext();) {
 				Join join = (Join) joinsIt.next();
@@ -209,29 +209,33 @@ public void visit(ExpressionList expressionList) {
 
 	}
 
-    public void visit(DateValue dateValue) {
-    }
+	public void visit(DateValue dateValue) {
+	}
 
-    public void visit(TimestampValue timestampValue) {
-    }
-    
-    public void visit(TimeValue timeValue) {
-    }
+	public void visit(TimestampValue timestampValue) {
+	}
 
-	/* (non-Javadoc)
+	public void visit(TimeValue timeValue) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.sf.jsqlparser.expression.ExpressionVisitor#visit(net.sf.jsqlparser.expression.CaseExpression)
 	 */
 	public void visit(CaseExpression caseExpression) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.sf.jsqlparser.expression.ExpressionVisitor#visit(net.sf.jsqlparser.expression.WhenClause)
 	 */
 	public void visit(WhenClause whenClause) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public void visit(AllComparisonExpression allComparisonExpression) {
diff --git a/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java b/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java
index 1d1dba3e0..1da190037 100644
--- a/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java
+++ b/testsrc/net/sf/jsqlparser/test/tablesfinder/TablesNamesFinderTest.java
@@ -28,7 +28,8 @@ public static void main(String[] args) {
 
 	public void testRUBiSTableList() throws Exception {
 
-		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator + "RUBiS-select-requests.txt"));
+		BufferedReader in = new BufferedReader(new FileReader("testfiles" + File.separator
+				+ "RUBiS-select-requests.txt"));
 		TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
 
 		try {
@@ -69,10 +70,10 @@ public void testRUBiSTableList() throws Exception {
 					StringTokenizer tokenizer = new StringTokenizer(tables, " ");
 					List tablesList = new ArrayList();
 					while (tokenizer.hasMoreTokens()) {
-					    tablesList.add(tokenizer.nextToken());
+						tablesList.add(tokenizer.nextToken());
 					}
-					
-					String[] tablesArray = (String[])tablesList.toArray(new String[tablesList.size()]); 
+
+					String[] tablesArray = (String[]) tablesList.toArray(new String[tablesList.size()]);
 
 					List tableListRetr = tablesNamesFinder.getTableList(select);
 					assertEquals("stm num:" + numSt, tablesArray.length, tableListRetr.size());
@@ -95,15 +96,14 @@ public void testRUBiSTableList() throws Exception {
 
 	public void testGetTableList() throws Exception {
 
-		String sql =
-			"SELECT * FROM MY_TABLE1, MY_TABLE2, (SELECT * FROM MY_TABLE3) LEFT OUTER JOIN MY_TABLE4 "
+		String sql = "SELECT * FROM MY_TABLE1, MY_TABLE2, (SELECT * FROM MY_TABLE3) LEFT OUTER JOIN MY_TABLE4 "
 				+ " WHERE ID = (SELECT MAX(ID) FROM MY_TABLE5) AND ID2 IN (SELECT * FROM MY_TABLE6)";
 		net.sf.jsqlparser.statement.Statement statement = pm.parse(new StringReader(sql));
-		 
-		//now you should use a class that implements StatementVisitor to decide what to do
-		//based on the kind of the statement, that is SELECT or INSERT etc. but here we are only
-		//interested in SELECTS
-		
+
+		// now you should use a class that implements StatementVisitor to decide what to do
+		// based on the kind of the statement, that is SELECT or INSERT etc. but here we are only
+		// interested in SELECTS
+
 		if (statement instanceof Select) {
 			Select selectStatement = (Select) statement;
 			TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
@@ -120,6 +120,6 @@ public void testGetTableList() throws Exception {
 
 	private String getLine(BufferedReader in) throws Exception {
 		return CCJSqlParserManagerTest.getLine(in);
-		}
+	}
 
 }
diff --git a/testsrc/net/sf/jsqlparser/test/truncate/TruncateTest.java b/testsrc/net/sf/jsqlparser/test/truncate/TruncateTest.java
index 2344a89a1..29352b746 100644
--- a/testsrc/net/sf/jsqlparser/test/truncate/TruncateTest.java
+++ b/testsrc/net/sf/jsqlparser/test/truncate/TruncateTest.java
@@ -18,8 +18,8 @@ public void testTruncate() throws Exception {
 		Truncate truncate = (Truncate) parserManager.parse(new StringReader(statement));
 		assertEquals("myschema", truncate.getTable().getSchemaName());
 		assertEquals("myschema.mytab", truncate.getTable().getWholeTableName());
-		assertEquals(statement.toUpperCase(), truncate.toString().toUpperCase());	
-		
+		assertEquals(statement.toUpperCase(), truncate.toString().toUpperCase());
+
 		statement = "TRUncATE   TABLE    mytab";
 		String toStringStatement = "TRUncATE TABLE mytab";
 		truncate = (Truncate) parserManager.parse(new StringReader(statement));
diff --git a/testsrc/net/sf/jsqlparser/test/update/UpdateTest.java b/testsrc/net/sf/jsqlparser/test/update/UpdateTest.java
index 4f2f2b7c2..96da97afa 100644
--- a/testsrc/net/sf/jsqlparser/test/update/UpdateTest.java
+++ b/testsrc/net/sf/jsqlparser/test/update/UpdateTest.java
@@ -18,6 +18,7 @@ public class UpdateTest extends TestCase {
 	public UpdateTest(String arg0) {
 		super(arg0);
 	}
+
 	public void testUpdate() throws JSQLParserException {
 		String statement = "UPDATE mytable set col1='as', col2=?, col3=565 Where o >= 3";
 		Update update = (Update) parserManager.parse(new StringReader(statement));