You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/06/25 13:47:49 UTC
svn commit: r550459 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql:
EJBQLBaseVisitor.java EJBQLExpressionVisitor.java parser/Compiler.java
parser/EJBQLFromItem.java
Author: aadamchik
Date: Mon Jun 25 04:47:48 2007
New Revision: 550459
URL: http://svn.apache.org/viewvc?view=rev&rev=550459
Log:
CAY-452 EJB QL Cayenne Query
simplifying 'from item' visitor method
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLBaseVisitor.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLFromItem.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLBaseVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLBaseVisitor.java?view=diff&rev=550459&r1=550458&r2=550459
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLBaseVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLBaseVisitor.java Mon Jun 25 04:47:48 2007
@@ -159,7 +159,7 @@
return continueFlag;
}
- public boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex) {
+ public boolean visitFromItem(EJBQLFromItem expression) {
return continueFlag;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java?view=diff&rev=550459&r1=550458&r2=550459
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLExpressionVisitor.java Mon Jun 25 04:47:48 2007
@@ -134,7 +134,7 @@
boolean visitFrom(EJBQLExpression expression, int finishedChildIndex);
- boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex);
+ boolean visitFromItem(EJBQLFromItem expression);
/**
* Called on visiting ">=" expression and also after visiting every expression child.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java?view=diff&rev=550459&r1=550458&r2=550459
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java Mon Jun 25 04:47:48 2007
@@ -140,7 +140,7 @@
return false;
}
- public boolean visitFromItem(EJBQLFromItem expression, int finishedChildIndex) {
+ public boolean visitFromItem(EJBQLFromItem expression) {
expression.visit(fromItemVisitor);
return false;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLFromItem.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLFromItem.java?view=diff&rev=550459&r1=550458&r2=550459
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLFromItem.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/EJBQLFromItem.java Mon Jun 25 04:47:48 2007
@@ -40,11 +40,6 @@
}
protected boolean visitNode(EJBQLExpressionVisitor visitor) {
- return visitor.visitFromItem(this, -1);
- }
-
- protected boolean visitChild(EJBQLExpressionVisitor visitor, int childIndex) {
- return super.visitChild(visitor, childIndex)
- && visitor.visitFromItem(this, childIndex);
+ return visitor.visitFromItem(this);
}
}