directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1144829 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event: ExpressionEvaluator.java LeafEvaluator.java
Date Sun, 10 Jul 2011 11:10:20 GMT
Author: akarasulu
Date: Sun Jul 10 11:10:19 2011
New Revision: 1144829

URL: http://svn.apache.org/viewvc?rev=1144829&view=rev
Log:
minor cleanup of unused fields

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=1144829&r1=1144828&r2=1144829&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
Sun Jul 10 11:10:19 2011
@@ -70,7 +70,8 @@ public class ExpressionEvaluator impleme
     {
         SubstringEvaluator substringEvaluator = null;
         substringEvaluator = new SubstringEvaluator();
-        leafEvaluator = new LeafEvaluator( schemaManager, substringEvaluator );
+//      leafEvaluator = new LeafEvaluator( schemaManager, substringEvaluator );
+        leafEvaluator = new LeafEvaluator( substringEvaluator );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1144829&r1=1144828&r2=1144829&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Sun Jul 10 11:10:19 2011
@@ -63,8 +63,8 @@ public class LeafEvaluator implements Ev
     /** substring matching type constant */
     private static final int SUBSTRING_MATCH = 3;
 
-    /** SchemaManager needed for normalizing and comparing values */
-    private SchemaManager schemaManager;
+//    /** SchemaManager needed for normalizing and comparing values */
+//    private SchemaManager schemaManager;
     
     /** Substring node evaluator we depend on */
     private SubstringEvaluator substringEvaluator;
@@ -82,15 +82,27 @@ public class LeafEvaluator implements Ev
      *
      * @param schemaManager The server schemaManager
      */
-    public LeafEvaluator( SchemaManager schemaManager,
-        SubstringEvaluator substringEvaluator )
+    public LeafEvaluator( SubstringEvaluator substringEvaluator )
     {
-        this.schemaManager = schemaManager;
         this.scopeEvaluator = new ScopeEvaluator();
         this.substringEvaluator = substringEvaluator;
     }
 
 
+//    /**
+//     * Creates a leaf expression node evaluator.
+//     *
+//     * @param schemaManager The server schemaManager
+//     */
+//    public LeafEvaluator( SchemaManager schemaManager,
+//        SubstringEvaluator substringEvaluator )
+//    {
+//        this.schemaManager = schemaManager;
+//        this.scopeEvaluator = new ScopeEvaluator();
+//        this.substringEvaluator = substringEvaluator;
+//    }
+
+
     public ScopeEvaluator getScopeEvaluator()
     {
         return scopeEvaluator;



Mime
View raw message