Skip to content

Commit

Permalink
Code reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
Florent Bécart committed Jun 20, 2011
1 parent b9ce35c commit fed74ae
Show file tree
Hide file tree
Showing 99 changed files with 1,224 additions and 1,172 deletions.
3 changes: 1 addition & 2 deletions src/net/sf/jsqlparser/JSQLParserException.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

package net.sf.jsqlparser;


/**
* An exception class with stack trace informations
*/
Expand All @@ -45,7 +44,7 @@ public JSQLParserException(String arg0, Throwable arg1) {
super(arg0);
this.cause = arg1;
}

public Throwable getCause() {
return cause;
}
Expand Down
6 changes: 3 additions & 3 deletions src/net/sf/jsqlparser/expression/AllComparisonExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/net/sf/jsqlparser/expression/AnyComparisonExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

public class AnyComparisonExpression implements Expression {
private SubSelect subSelect;

public AnyComparisonExpression(SubSelect subSelect) {
this.subSelect = subSelect;
}

public SubSelect GetSubSelect() {
return subSelect;
}
Expand Down
10 changes: 4 additions & 6 deletions src/net/sf/jsqlparser/expression/BinaryExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,7 +33,6 @@ public abstract class BinaryExpression implements Expression {

public BinaryExpression() {
}


public Expression getLeftExpression() {
return leftExpression;
Expand All @@ -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();

}
52 changes: 29 additions & 23 deletions src/net/sf/jsqlparser/expression/CaseExpression.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
/**
* CASE/WHEN expression.
*
* Syntax:
* <code><pre>
* Syntax: <code><pre>
* CASE
* WHEN condition THEN expression
* [WHEN condition THEN expression]...
Expand All @@ -49,72 +48,79 @@
* [ELSE expression]
* END
* </pre></code>
*
* 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";
}
}
7 changes: 2 additions & 5 deletions src/net/sf/jsqlparser/expression/DateValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,20 @@
import java.sql.Date;
import java.text.SimpleDateFormat;


/**
* A Date in the form {d 'yyyy-mm-dd'}
*/
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;
}
Expand All @@ -48,5 +46,4 @@ public void setValue(Date d) {
value = d;
}


}
10 changes: 4 additions & 6 deletions src/net/sf/jsqlparser/expression/DoubleValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/
package net.sf.jsqlparser.expression;


/**
* Every number with a point or a exponential format is a DoubleValue
*/
Expand All @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/net/sf/jsqlparser/expression/Expression.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
43 changes: 40 additions & 3 deletions src/net/sf/jsqlparser/expression/ExpressionVisitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

}
Loading

0 comments on commit fed74ae

Please sign in to comment.