svn commit: rev 47539 - in incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db: . jdbm

[akarasulu]

Author: akarasulu
Date: Wed Sep 29 20:29:17 2004
New Revision: 47539

Added:
   
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
      - copied, changed from rev 47525, 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ConjunctionEnumeratorImpl.java
Removed:
   
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ConjunctionEnumeratorImpl.java
Modified:
   
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
Log:
Moving and renaming ConjunctionEnumeratorImpl to ConjunctionEnumerator.  This
class is not dependent on jdbm.


Copied: 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
 (from rev 47525, 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ConjunctionEnumeratorImpl.java)
==============================================================================
--- 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/ConjunctionEnumeratorImpl.java
   (original)
+++ 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
    Wed Sep 29 20:29:17 2004
@@ -1,4 +1,4 @@
-package org.apache.eve.db.jdbm;
+package org.apache.eve.db;
 
 
 import java.util.ArrayList;
@@ -18,7 +18,7 @@
  * candidates satisfying a filter expression of AND'ed filter sub-expressions.
  * 
  */
-public class ConjunctionEnumeratorImpl implements Enumerator
+public class ConjunctionEnumerator implements Enumerator
 {
     /** Top level evaluator Avalon dependency */
     private Evaluator evaluator;
@@ -32,7 +32,7 @@
      * @param enumerator the top level expression enumerator
      * @param evaluator the top level expression evaluator
      */
-    public ConjunctionEnumeratorImpl( Enumerator enumerator, Evaluator 
evaluator )
+    public ConjunctionEnumerator( Enumerator enumerator, Evaluator evaluator )
     {
         this.enumerator = enumerator;
         this.evaluator = evaluator;

Modified: 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
==============================================================================
--- 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
      (original)
+++ 
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/EnumeratorImpl.java
      Wed Sep 29 20:29:17 2004
@@ -30,7 +30,7 @@
     /** Enumerator flyweight for evaulating filter substring assertions */
     private SubstringEnumerator substringEnumerator;
     /** Enumerator flyweight for evaulating filter conjunction assertions */
-    private ConjunctionEnumeratorImpl conjunctionEnumerator;
+    private ConjunctionEnumerator conjunctionEnumerator;
     /** Enumerator flyweight for evaulating filter disjunction assertions */
     private DisjunctionEnumerator disjunctionEnumerator;
     /** Enumerator flyweight for evaulating filter negation assertions */
@@ -45,7 +45,7 @@
         this.db = db;
         scopeEnumerator = new ScopeEnumeratorImpl();
         substringEnumerator = new SubstringEnumeratorImpl();
-        conjunctionEnumerator = new ConjunctionEnumeratorImpl( this, 
topEvaluator );
+        conjunctionEnumerator = new ConjunctionEnumerator( this, topEvaluator 
);
         disjunctionEnumerator = new DisjunctionEnumeratorImpl( this );
         negationEnumerator = new NegationEnumeratorImpl();
     }