directory-commits mailing list archives

Author: akarasulu
Date: Fri Mar 28 19:36:10 2008
New Revision: 642491

URL: http://svn.apache.org/viewvc?rev=642491&view=rev
Log:
checkpoint before mergine code from bigbang

Modified:
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluatorBuilder.java

Modified: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=642491&r1=642490&r2=642491&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
Fri Mar 28 19:36:10 2008
@@ -30,7 +30,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface EvaluatorBuilder<E>
+public interface EvaluatorBuilder<N extends ExprNode, E>
 {
     /**
      * Builds an Evaluator based on the filter expression provided.
@@ -39,5 +39,5 @@
      * @return the evaluator for the AST
      * @throws Exception on database faults during construction
      */
-    Evaluator<E> build( ExprNode expression ) throws Exception;
+    Evaluator<N,E> build( ExprNode expression ) throws Exception;
 }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluatorBuilder.java?rev=642491&r1=642490&r2=642491&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluatorBuilder.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluatorBuilder.java
Fri Mar 28 19:36:10 2008
@@ -25,11 +25,7 @@
 
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.filter.AndNode;
-import org.apache.directory.shared.ldap.filter.BranchNode;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.NotNode;
-import org.apache.directory.shared.ldap.filter.OrNode;
+import org.apache.directory.shared.ldap.filter.*;
 
 
 /**
@@ -38,7 +34,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ExpressionEvaluatorBuilder implements EvaluatorBuilder<Attributes>
+public class ExpressionEvaluatorBuilder implements EvaluatorBuilder<ExprNode,Attributes>
 {
     private final Store<Attributes> db;
     private final Registries registries;
@@ -70,11 +66,11 @@
     /**
      * @see EvaluatorBuilder#build(ExprNode)
      */
-    public Evaluator<Attributes> build( ExprNode node ) throws NamingException
+    public Evaluator<ExprNode, Attributes> build( ExprNode node ) throws NamingException
     {
         if ( node.isLeaf() )
         {
-            return new LeafEvaluator( node );
+            switch ( )
         }
 
         BranchNode bnode = ( BranchNode ) node;