directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r666516 - in /directory: apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ project/branches/bigbang/resources/
Date Wed, 11 Jun 2008 03:59:13 GMT
Author: akarasulu
Date: Tue Jun 10 20:59:12 2008
New Revision: 666516

URL: http://svn.apache.org/viewvc?rev=666516&view=rev
Log:
some import and generics cleanup and adding user dictionary for eclipse

Added:
    directory/project/branches/bigbang/resources/dictionary
Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java?rev=666516&r1=666515&r2=666516&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/Evaluator.java
Tue Jun 10 20:59:12 2008
@@ -27,7 +27,7 @@
 
 
 /**
- * Tests if an entry is eligable for return by evaluating a filter expression on
+ * Tests if an entry is eligible for return by evaluating a filter expression on
  * the candidate.  The evaluation can proceed by applying the filter on the 
  * attributes of the entry itself or indices can be used for rapid evaluation.
  * 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=666516&r1=666515&r2=666516&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Tue Jun 10 20:59:12 2008
@@ -36,7 +36,6 @@
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
@@ -44,7 +43,6 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.normalization.NormalizingVisitor;
 import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -72,7 +70,7 @@
 
 
 /**
- * An interceptor based serivice for notifying NamingListeners of EventContext
+ * An interceptor based service for notifying NamingListeners of EventContext
  * and EventDirContext changes.
  *
  * @org.apache.xbean.XBean
@@ -84,7 +82,6 @@
 {
     private static Logger log = LoggerFactory.getLogger( EventInterceptor.class );
 
-    private PartitionNexus nexus;
     private Map<NamingListener, Object> sources = new HashMap<NamingListener, Object>();
     private Evaluator evaluator;
     private AttributeTypeRegistry attributeRegistry;
@@ -98,7 +95,6 @@
         OidRegistry oidRegistry = directoryService.getRegistries().getOidRegistry();
         attributeRegistry = directoryService.getRegistries().getAttributeTypeRegistry();
         evaluator = new ExpressionEvaluator( oidRegistry, attributeRegistry );
-        nexus = directoryService.getPartitionNexus();
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry,
oidRegistry );
         visitor = new NormalizingVisitor( ncn, directoryService.getRegistries() );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=666516&r1=666515&r2=666516&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Tue Jun 10 20:59:12 2008
@@ -118,15 +118,15 @@
         }
         else if ( ( node instanceof EqualityNode ) || ( node instanceof ApproximateNode )
)
         {
-            return evalEquality( ( EqualityNode ) node, entry );
+            return evalEquality( ( EqualityNode<?> ) node, entry );
         }
         else if ( node instanceof GreaterEqNode )
         {
-            return evalGreaterOrLesser( ( GreaterEqNode ) node, entry, COMPARE_GREATER );
+            return evalGreaterOrLesser( ( GreaterEqNode<?> ) node, entry, COMPARE_GREATER
);
         }
         else if ( node instanceof LessEqNode )
         {
-            return evalGreaterOrLesser( ( LessEqNode ) node, entry, COMPARE_LESSER );
+            return evalGreaterOrLesser( ( LessEqNode<?> ) node, entry, COMPARE_LESSER
);
         }
         else if ( node instanceof SubstringNode )
         {
@@ -154,7 +154,8 @@
      * @return the ava evaluation on the perspective candidate
      * @throws javax.naming.NamingException if there is a database access failure
      */
-    private boolean evalGreaterOrLesser( SimpleNode node, ServerEntry entry, boolean isGreaterOrLesser
)
+    @SuppressWarnings("unchecked")
+    private boolean evalGreaterOrLesser( SimpleNode<?> node, ServerEntry entry, boolean
isGreaterOrLesser )
         throws NamingException
     {
         String attrId = node.getAttribute();
@@ -241,7 +242,8 @@
      * @return the ava evaluation on the perspective candidate
      * @throws javax.naming.NamingException if there is a database access failure
      */
-    private boolean evalEquality( EqualityNode node, ServerEntry entry ) throws NamingException
+    @SuppressWarnings("unchecked")
+    private boolean evalEquality( EqualityNode<?> node, ServerEntry entry ) throws
NamingException
     {
         Normalizer normalizer = getNormalizer( node.getAttribute() );
         Comparator comparator = getComparator( node.getAttribute() );
@@ -304,7 +306,7 @@
      * @return the comparator for equality matching
      * @throws javax.naming.NamingException if there is a failure
      */
-    private Comparator getComparator( String attrId ) throws NamingException
+    private Comparator<?> getComparator( String attrId ) throws NamingException
     {
         MatchingRule mrule = getMatchingRule( attrId, EQUALITY_MATCH );
         return mrule.getComparator();

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=666516&r1=666515&r2=666516&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
Tue Jun 10 20:59:12 2008
@@ -21,7 +21,6 @@
 
 
 import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -30,7 +29,7 @@
 
 
 /**
- * Evaluates ScopeNode assertions on candidates using a database.
+ * Evaluates ScopeNode assertions on candidates.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$

Added: directory/project/branches/bigbang/resources/dictionary
URL: http://svn.apache.org/viewvc/directory/project/branches/bigbang/resources/dictionary?rev=666516&view=auto
==============================================================================
--- directory/project/branches/bigbang/resources/dictionary (added)
+++ directory/project/branches/bigbang/resources/dictionary Tue Jun 10 20:59:12 2008
@@ -0,0 +1,7 @@
+Apache
+xbean
+interceptor
+apache
+org
+href
+Rev



Mime
View raw message