svn commit: r779447 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java

[fancy]

Author: fancy
Date: Thu May 28 06:27:31 2009
New Revision: 779447

URL: http://svn.apache.org/viewvc?rev=779447&view=rev
Log:
OPENJPA-1098 JPA2 Query support for subselect_identification_variable
no functional changes

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=779447&r1=779446&r2=779447&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
 Thu May 28 06:27:31 2009
@@ -1513,7 +1513,7 @@
             new Object[]{ name }, null);
     }
 
-    private Value validateMapPath(JPQLNode node, JPQLNode id) {
+    private Path validateMapPath(JPQLNode node, JPQLNode id) {
         Path path = (Path) getValue(id);
         FieldMetaData fld = path.last();
 
@@ -1550,7 +1550,7 @@
             throw parseException(EX_USER, "bad-general-identifier",
                 new Object[]{ id.text, "VALUE" }, null);
 
-        Path path = (Path) validateMapPath(node, id);
+        Path path = validateMapPath(node, id);
         FieldMetaData fld = path.last();
         path = (Path) factory.getKey(path);
         ClassMetaData meta = fld.getKey().getTypeMetaData();
@@ -1566,7 +1566,7 @@
 
     private Value getQualifiedIdentifier(JPQLNode node) {
         JPQLNode id = onlyChild(node);               
-        Path path = (Path) validateMapPath(node, id);
+        Path path = validateMapPath(node, id);
 
         if (node.id == JJTVALUE)
             return path;
@@ -1578,17 +1578,17 @@
             return factory.mapEntry(path, value);
     }
 
-    private Value getQualifiedPath(JPQLNode node) {
+    private Path getQualifiedPath(JPQLNode node) {
         return getQualifiedPath(node, false, true);
     }
 
-    private Value getQualifiedPath(JPQLNode node, boolean pcOnly, boolean 
inner)
+    private Path getQualifiedPath(JPQLNode node, boolean pcOnly, boolean inner)
     {
         int nChild = node.getChildCount();
         JPQLNode firstChild = firstChild(node);
         JPQLNode id = firstChild.id == JJTKEY ? onlyChild(firstChild) :
                firstChild;               
-        Path path = (Path) validateMapPath(firstChild, id);
+        Path path = validateMapPath(firstChild, id);
 
         if (firstChild.id == JJTIDENTIFIER)
             return getPath(node);