svn commit: r1299749 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query: ParserSQL2.java QueryManagerImpl.java

[md...@apache.org]

Author: mduerig
Date: Mon Mar 12 17:31:59 2012
New Revision: 1299749

URL: http://svn.apache.org/viewvc?rev=1299749&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- typos 

Modified:
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/QueryManagerImpl.java

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java?rev=1299749&r1=1299748&r2=1299749&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java Mon Mar 12 17:31:59 2012
@@ -16,9 +16,8 @@
  */
 package org.apache.jackrabbit.query;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
+import org.apache.jackrabbit.query.qom.QueryObjectModelFactoryImpl;
+import org.apache.jackrabbit.query.qom.QueryObjectModelImpl;
 
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
@@ -38,8 +37,9 @@ import javax.jcr.query.qom.QueryObjectMo
 import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.Source;
 import javax.jcr.query.qom.StaticOperand;
-import org.apache.jackrabbit.query.qom.QueryObjectModelFactoryImpl;
-import org.apache.jackrabbit.query.qom.QueryObjectModelImpl;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
  * The SQL2 parser can convert a JCR-SQL2 query to a QueryObjectModel.
@@ -256,7 +256,7 @@ public class ParserSQL2 {
         } else if (currentTokenType == IDENTIFIER) {
             String identifier = readName();
             if (readIf("(")) {
-                a = parseConditionFuntionIf(identifier);
+                a = parseConditionFunctionIf(identifier);
                 if (a == null) {
                     DynamicOperand op = parseExpressionFunction(identifier);
                     a = parseCondition(op);
@@ -340,7 +340,7 @@ public class ParserSQL2 {
         return factory.propertyExistence(p.getSelectorName(), p.getPropertyName());
     }
 
-    private Constraint parseConditionFuntionIf(String functionName) throws RepositoryException {
+    private Constraint parseConditionFunctionIf(String functionName) throws RepositoryException {
         Constraint c;
         if ("CONTAINS".equalsIgnoreCase(functionName)) {
             String name = readName();

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/QueryManagerImpl.java?rev=1299749&r1=1299748&r2=1299749&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/QueryManagerImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/QueryManagerImpl.java Mon Mar 12 17:31:59 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.query;
 
+import org.apache.jackrabbit.query.qom.QueryObjectModelFactoryImpl;
+
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.ValueFactory;
@@ -23,7 +25,6 @@ import javax.jcr.query.InvalidQueryExcep
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.qom.QueryObjectModel;
-import org.apache.jackrabbit.query.qom.QueryObjectModelFactoryImpl;
 /**
  * The implementation of the corresponding JCR interface.
  */
@@ -35,7 +36,7 @@ public class QueryManagerImpl implements
     @SuppressWarnings("deprecation")
     private static final String XPATH = Query.XPATH;
 
-    private static final String[] SUPPOERTED_QUERY_LANGUAGES = {
+    private static final String[] SUPPORTED_QUERY_LANGUAGES = {
         Query.JCR_JQOM,
         Query.JCR_SQL2,
         XPATH
@@ -75,7 +76,7 @@ public class QueryManagerImpl implements
     @Override
     public String[] getSupportedQueryLanguages() throws RepositoryException {
         // TODO the list is mutable
-        return SUPPOERTED_QUERY_LANGUAGES;
+        return SUPPORTED_QUERY_LANGUAGES;
     }
 
 }