cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r722021 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser: CompiledExpression.java Compiler.java
Date Mon, 01 Dec 2008 10:02:38 GMT
Author: aadamchik
Date: Mon Dec  1 02:02:35 2008
New Revision: 722021

URL: http://svn.apache.org/viewvc?rev=722021&view=rev
Log:
CAY-1136 "Compiled" EntityResult ; Switch SelectQuery processing to use EntityResult

refactoring local ivars

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java?rev=722021&r1=722020&r2=722021&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
Mon Dec  1 02:02:35 2008
@@ -41,7 +41,7 @@
     private Map<String, ClassDescriptor> descriptorsById;
     private Map<String, ObjRelationship> incomingById;
     private EJBQLExpression expression;
-    private SQLResult resultSetMapping;
+    private SQLResult result;
 
     public ClassDescriptor getEntityDescriptor(String idVariable) {
         if (idVariable == null) {
@@ -52,7 +52,7 @@
     }
 
     public SQLResult getResult() {
-        return resultSetMapping;
+        return result;
     }
 
     public ClassDescriptor getRootDescriptor() {
@@ -96,7 +96,7 @@
         this.rootId = rootId;
     }
 
-    void setResultSetMapping(SQLResult resultSetMapping) {
-        this.resultSetMapping = resultSetMapping;
+    void setResult(SQLResult resultSetMapping) {
+        this.result = resultSetMapping;
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java?rev=722021&r1=722020&r2=722021&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
Mon Dec  1 02:02:35 2008
@@ -138,7 +138,7 @@
                 }
             }
 
-            compiled.setResultSetMapping(mapping);
+            compiled.setResult(mapping);
         }
 
         return compiled;



Mime
View raw message