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/03/21 13:58:38 UTC
svn commit: r520871 -
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java
Author: aadamchik
Date: Wed Mar 21 05:58:37 2007
New Revision: 520871
URL: http://svn.apache.org/viewvc?view=rev&rev=520871
Log:
CAY-452: EJB QL Cayenne Query
more of the same - slowly moving ahead with translator
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java?view=diff&rev=520871&r1=520870&r2=520871
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/query/EJBQLConditionTranslator.java Wed Mar 21 05:58:37 2007
@@ -34,40 +34,38 @@
}
public boolean visitAnd(EJBQLExpression expression, int finishedChildIndex) {
- if (finishedChildIndex >= 0) {
- afterChild(expression, " AND", finishedChildIndex);
- }
-
+ afterChild(expression, " AND", finishedChildIndex);
return true;
}
public boolean visitEquals(EJBQLExpression expression, int finishedChildIndex) {
- if (finishedChildIndex >= 0) {
- afterChild(expression, " =", finishedChildIndex);
- }
-
+ afterChild(expression, " #", finishedChildIndex);
return true;
}
public boolean visitOr(EJBQLExpression expression, int finishedChildIndex) {
- if (finishedChildIndex >= 0) {
- afterChild(expression, " OR", finishedChildIndex);
- }
-
+ afterChild(expression, " OR", finishedChildIndex);
return true;
}
protected void afterChild(EJBQLExpression e, String text, int childIndex) {
- if (childIndex + 1 < e.getChildrenCount()) {
- parent.getParent().getBuffer().append(text);
- }
+ if (childIndex >= 0) {
+ if (childIndex + 1 < e.getChildrenCount()) {
+ parent.getParent().getBuffer().append(text);
+ }
- // reset delegate if it was set for a child
- setDelegate(null);
+ // reset child-specific delegate
+ setDelegate(null);
+ }
}
public boolean visitPath(EJBQLExpression expression) {
setDelegate(new EJBQLPathVisitor());
+ return true;
+ }
+
+ public boolean visitStringLiteral(EJBQLExpression expression) {
+
return true;
}
}