directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r917231 - in /directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server: core/partition/impl/btree/ xdbm/ xdbm/search/
Date Sun, 28 Feb 2010 17:56:17 GMT
Author: seelmann
Date: Sun Feb 28 17:56:16 2010
New Revision: 917231

URL: http://svn.apache.org/viewvc?rev=917231&view=rev
Log:
formatting

Modified:
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Feb 28 17:56:16 2010
@@ -93,31 +93,29 @@
     protected int cacheSize = -1;
     protected LdapDN suffix;
     private File partitionDir;
-    
+
     /** The rootDSE context */
     protected ServerEntry contextEntry;
-	private Set<Index<?,ServerEntry>> indexedAttributes;
+    private Set<Index<?, ServerEntry>> indexedAttributes;
 
 
     // ------------------------------------------------------------------------
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a B-tree based context partition.
      */
     protected BTreePartition()
     {
-        indexedAttributes = new HashSet<Index<?,ServerEntry>>();
+        indexedAttributes = new HashSet<Index<?, ServerEntry>>();
     }
 
-    
+
     // ------------------------------------------------------------------------
     // C O N F I G U R A T I O N   M E T H O D S
     // ------------------------------------------------------------------------
 
-
     /**
      * {@inheritDoc}
      */
@@ -125,8 +123,8 @@
     {
         this.schemaManager = schemaManager;
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -134,8 +132,8 @@
     {
         return schemaManager;
     }
-    
-    
+
+
     /**
      * Gets the directory in which this Partition stores files.
      *
@@ -145,8 +143,8 @@
     {
         return partitionDir;
     }
-    
-    
+
+
     /**
      * Sets the directory in which this Partition stores files.
      *
@@ -156,24 +154,24 @@
     {
         this.partitionDir = partitionDir;
     }
-    
-    
-    public void setIndexedAttributes( Set<Index<?,ServerEntry>> indexedAttributes )
+
+
+    public void setIndexedAttributes( Set<Index<?, ServerEntry>> indexedAttributes )
     {
         this.indexedAttributes = indexedAttributes;
     }
 
 
-    public void addIndexedAttributes( Index<?,ServerEntry>... indexes )
+    public void addIndexedAttributes( Index<?, ServerEntry>... indexes )
     {
-        for ( Index<?,ServerEntry> index : indexes )
+        for ( Index<?, ServerEntry> index : indexes )
         {
             indexedAttributes.add( index );
         }
     }
 
 
-    public Set<Index<?,ServerEntry>> getIndexedAttributes()
+    public Set<Index<?, ServerEntry>> getIndexedAttributes()
     {
         return indexedAttributes;
     }
@@ -223,13 +221,12 @@
     {
         this.id = id;
     }
-    
-    
+
+
     // -----------------------------------------------------------------------
     // E N D   C O N F I G U R A T I O N   M E T H O D S
     // -----------------------------------------------------------------------
 
-
     // ------------------------------------------------------------------------
     // Public Accessors - not declared in any interfaces just for this class
     // ------------------------------------------------------------------------
@@ -250,14 +247,13 @@
     // Partition Interface Method Implementations
     // ------------------------------------------------------------------------
 
-
     /**
      * {@inheritDoc}
      */
     public void delete( DeleteOperationContext opContext ) throws Exception
     {
         LdapDN dn = opContext.getDn();
-        
+
         Long id = getEntryId( dn.getNormName() );
 
         // don't continue if id is null
@@ -285,20 +281,17 @@
 
     public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
     {
-        return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor( this, 
-            list( getEntryId( opContext.getDn().getNormName() ) ) ), opContext );
+        return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor( this, list( getEntryId( opContext.getDn()
+            .getNormName() ) ) ), opContext );
     }
 
 
     public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
     {
         SearchControls searchCtls = opContext.getSearchControls();
-        IndexCursor<Long,ServerEntry> underlying;
+        IndexCursor<Long, ServerEntry> underlying;
 
-        underlying = searchEngine.cursor( 
-            opContext.getDn(),
-            opContext.getAliasDerefMode(),
-            opContext.getFilter(), 
+        underlying = searchEngine.cursor( opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(),
             searchCtls );
 
         return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor( this, underlying ), opContext );
@@ -308,12 +301,12 @@
     public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
     {
         Long id = getEntryId( opContext.getDn().getNormName() );
-        
+
         if ( id == null )
         {
             return null;
         }
-        
+
         ClonedServerEntry entry = lookup( id );
 
         if ( ( opContext.getAttrsId() == null ) || ( opContext.getAttrsId().size() == 0 ) )
@@ -321,9 +314,9 @@
             return entry;
         }
 
-        for ( AttributeType attributeType : ((ServerEntry)entry.getOriginalEntry()).getAttributeTypes() )
+        for ( AttributeType attributeType : ( ( ServerEntry ) entry.getOriginalEntry() ).getAttributeTypes() )
         {
-            if ( ! opContext.getAttrsId().contains( attributeType.getOid() ) )
+            if ( !opContext.getAttrsId().contains( attributeType.getOid() ) )
             {
                 entry.removeAttributes( attributeType );
             }
@@ -364,7 +357,7 @@
     // Index Operations 
     // ------------------------------------------------------------------------
 
-    public abstract void addIndexOn( Index<Long,ServerEntry> index ) throws Exception;
+    public abstract void addIndexOn( Index<Long, ServerEntry> index ) throws Exception;
 
 
     public abstract boolean hasUserIndexOn( String attribute ) throws Exception;
@@ -373,7 +366,7 @@
     public abstract boolean hasSystemIndexOn( String attribute ) throws Exception;
 
 
-    public abstract Index<String,ServerEntry> getPresenceIndex();
+    public abstract Index<String, ServerEntry> getPresenceIndex();
 
 
     /**
@@ -382,7 +375,7 @@
      *
      * @return the one level Index
      */
-    public abstract Index<Long,ServerEntry> getOneLevelIndex();
+    public abstract Index<Long, ServerEntry> getOneLevelIndex();
 
 
     /**
@@ -391,7 +384,7 @@
      *
      * @return the sub tree level Index
      */
-    public abstract Index<Long,ServerEntry> getSubLevelIndex();
+    public abstract Index<Long, ServerEntry> getSubLevelIndex();
 
 
     /**
@@ -400,7 +393,7 @@
      *
      * @return the user provided distinguished name Index
      */
-    public abstract Index<String,ServerEntry> getUpdnIndex();
+    public abstract Index<String, ServerEntry> getUpdnIndex();
 
 
     /**
@@ -409,7 +402,7 @@
      *
      * @return the normalized distinguished name Index
      */
-    public abstract Index<String,ServerEntry> getNdnIndex();
+    public abstract Index<String, ServerEntry> getNdnIndex();
 
 
     /**
@@ -419,7 +412,7 @@
      * 
      * @return the one alias index
      */
-    public abstract Index<Long,ServerEntry> getOneAliasIndex();
+    public abstract Index<Long, ServerEntry> getOneAliasIndex();
 
 
     /**
@@ -429,7 +422,7 @@
      * 
      * @return the sub alias index
      */
-    public abstract Index<Long,ServerEntry> getSubAliasIndex();
+    public abstract Index<Long, ServerEntry> getSubAliasIndex();
 
 
     /**
@@ -438,7 +431,7 @@
      * 
      * @return the index on the ALIAS_ATTRIBUTE
      */
-    public abstract Index<String,ServerEntry> getAliasIndex();
+    public abstract Index<String, ServerEntry> getAliasIndex();
 
 
     /**
@@ -449,7 +442,7 @@
      * @param index the index on the ALIAS_ATTRIBUTE
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setAliasIndexOn( Index<String,ServerEntry> index ) throws Exception;
+    public abstract void setAliasIndexOn( Index<String, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -459,7 +452,7 @@
      * @param index the attribute existence Index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setPresenceIndexOn( Index<String,ServerEntry> index ) throws Exception;
+    public abstract void setPresenceIndexOn( Index<String, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -469,7 +462,8 @@
      * @param index the one level Index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setOneLevelIndexOn( Index<Long,ServerEntry> index ) throws Exception;
+    public abstract void setOneLevelIndexOn( Index<Long, ServerEntry> index ) throws Exception;
+
 
     // TODO - add sub level index setter
 
@@ -480,7 +474,7 @@
      * @param index the updn Index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setUpdnIndexOn( Index<String,ServerEntry> index ) throws Exception;
+    public abstract void setUpdnIndexOn( Index<String, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -490,7 +484,7 @@
      * @param index the ndn Index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setNdnIndexOn( Index<String,ServerEntry> index ) throws Exception;
+    public abstract void setNdnIndexOn( Index<String, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -502,7 +496,7 @@
      * @param index a one level alias index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setOneAliasIndexOn( Index<Long,ServerEntry> index ) throws Exception;
+    public abstract void setOneAliasIndexOn( Index<Long, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -514,7 +508,7 @@
      * @param index a subtree alias index
      * @throws Exception if there is a problem setting up the index
      */
-    public abstract void setSubAliasIndexOn( Index<Long,ServerEntry> index ) throws Exception;
+    public abstract void setSubAliasIndexOn( Index<Long, ServerEntry> index ) throws Exception;
 
 
     /**
@@ -544,10 +538,10 @@
     }
 
 
-    public abstract Index<?,ServerEntry> getUserIndex( String attribute ) throws Exception;
+    public abstract Index<?, ServerEntry> getUserIndex( String attribute ) throws Exception;
 
 
-    public abstract Index<?,ServerEntry> getSystemIndex( String attribute ) throws Exception;
+    public abstract Index<?, ServerEntry> getSystemIndex( String attribute ) throws Exception;
 
 
     public abstract Long getEntryId( String dn ) throws Exception;
@@ -588,7 +582,7 @@
     public abstract void delete( Long id ) throws Exception;
 
 
-    public abstract IndexCursor<Long,ServerEntry> list( Long id ) throws Exception;
+    public abstract IndexCursor<Long, ServerEntry> list( Long id ) throws Exception;
 
 
     public abstract int getChildCount( Long id ) throws Exception;

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java Sun Feb 28 17:56:16 2010
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DefaultTupleComparator<K,V> implements TupleComparator<K,V>
+public class DefaultTupleComparator<K, V> implements TupleComparator<K, V>
 {
     SerializableComparator<K> keyComparator;
     SerializableComparator<V> valueComparator;

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java Sun Feb 28 17:56:16 2010
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 539571 $
  */
-public class ForwardIndexComparator<K> implements TupleComparator<K,Long>
+public class ForwardIndexComparator<K> implements TupleComparator<K, Long>
 {
     private static final long serialVersionUID = 3257283621751633459L;
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java Sun Feb 28 17:56:16 2010
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface IndexAssertion<K,E>
+public interface IndexAssertion<K, E>
 {
     /**
      * Tests to see if a perspective candidate should be returned based on 
@@ -47,5 +47,5 @@
      * @throws NamingException if their are failures while asserting the 
      * condition
      */
-    boolean assertCandidate( IndexEntry<K,E> entry ) throws Exception;
+    boolean assertCandidate( IndexEntry<K, E> entry ) throws Exception;
 }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java Sun Feb 28 17:56:16 2010
@@ -47,7 +47,7 @@
     /** The iteration cursor */
     private final NamingEnumeration<ForwardIndexEntry> underlying;
     /** LUT used to avoid returning duplicates */
-    private final Map<Object,Object> candidates;
+    private final Map<Object, Object> candidates;
     /** */
     private final IndexAssertion assertion;
     /** */
@@ -60,7 +60,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     public IndexAssertionEnumeration( NamingEnumeration<ForwardIndexEntry> underlying, IndexAssertion assertion )
         throws NamingException
     {
@@ -76,7 +75,7 @@
         boolean enableDupCheck ) throws NamingException
     {
         this.underlying = underlying;
-        candidates = new HashMap<Object,Object>();
+        candidates = new HashMap<Object, Object>();
         this.assertion = assertion;
         checkDups = enableDupCheck;
         prefetch();

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Sun Feb 28 17:56:16 2010
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-
 import java.util.Iterator;
 
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -41,7 +40,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class IndexCursorAdaptor<K,O> implements IndexCursor<K,O>
+public class IndexCursorAdaptor<K, O> implements IndexCursor<K, O>
 {
     @SuppressWarnings("unchecked")
     final Cursor<Tuple> wrappedCursor;
@@ -63,7 +62,7 @@
         this.wrappedCursor = wrappedCursor;
         if ( forwardIndex )
         {
-            forwardEntry = new ForwardIndexEntry<K,O>();
+            forwardEntry = new ForwardIndexEntry<K, O>();
             reverseEntry = null;
         }
         else
@@ -159,13 +158,13 @@
     {
         if ( forwardEntry != null )
         {
-            Tuple<K,Long> tuple = wrappedCursor.get();
+            Tuple<K, Long> tuple = wrappedCursor.get();
             forwardEntry.setTuple( tuple, null );
             return forwardEntry;
         }
         else
         {
-            Tuple<Long,K> tuple = wrappedCursor.get();
+            Tuple<Long, K> tuple = wrappedCursor.get();
             reverseEntry.setTuple( tuple, null );
             return reverseEntry;
         }
@@ -176,8 +175,8 @@
     {
         return true;
     }
-    
-    
+
+
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         wrappedCursor.setClosureMonitor( monitor );
@@ -198,6 +197,6 @@
 
     public Iterator<IndexEntry<K, O>> iterator()
     {
-        return new CursorIterator<IndexEntry<K,O>>( this );
+        return new CursorIterator<IndexEntry<K, O>>( this );
     }
 }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java Sun Feb 28 17:56:16 2010
@@ -61,7 +61,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-    
     public IndexEnumeration( NamingEnumeration<Tuple> list ) throws NamingException
     {
         this( list, false, null );
@@ -74,8 +73,7 @@
     }
 
 
-    public IndexEnumeration( NamingEnumeration<Tuple> list, boolean swapKeyVal, Pattern regex ) 
-        throws NamingException
+    public IndexEnumeration( NamingEnumeration<Tuple> list, boolean swapKeyVal, Pattern regex ) throws NamingException
     {
         re = regex;
         underlying = list;
@@ -154,7 +152,6 @@
     // Private Methods 
     // ------------------------------------------------------------------------
 
-
     private void prefetch() throws NamingException
     {
         while ( underlying.hasMore() )

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java Sun Feb 28 17:56:16 2010
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class KeyOnlyComparator<K,V> implements TupleComparator<K,V>, Serializable
+public class KeyOnlyComparator<K, V> implements TupleComparator<K, V>, Serializable
 {
     private static final long serialVersionUID = 3544956549803161397L;
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java Sun Feb 28 17:56:16 2010
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 539571 $
  */
-public class ReverseIndexComparator<V> implements TupleComparator<Long,V>
+public class ReverseIndexComparator<V> implements TupleComparator<Long, V>
 {
     private static final long serialVersionUID = 3257283621751633459L;
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java Sun Feb 28 17:56:16 2010
@@ -42,14 +42,14 @@
     private final Partition db;
     private final IndexCursor<Long, ServerEntry> indexCursor;
 
-    
+
     public ServerEntryCursorAdaptor( Partition db, IndexCursor<Long, ServerEntry> indexCursor )
     {
         this.db = db;
         this.indexCursor = indexCursor;
     }
-    
-    
+
+
     /* 
      * @see Cursor#after(java.lang.Object)
      */
@@ -94,12 +94,12 @@
         indexCursor.beforeFirst();
     }
 
-    
+
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         indexCursor.setClosureMonitor( monitor );
     }
-    
+
 
     /* 
      * @see Cursor#close()
@@ -133,7 +133,7 @@
      */
     public ServerEntry get() throws Exception
     {
-        IndexEntry<Long,ServerEntry> indexEntry = indexCursor.get();
+        IndexEntry<Long, ServerEntry> indexEntry = indexCursor.get();
 
         if ( indexEntry.getObject() == null )
         {

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java Sun Feb 28 17:56:16 2010
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface TupleComparator<K,V> extends Serializable
+public interface TupleComparator<K, V> extends Serializable
 {
     /**
      * Gets the comparator used to compare keys.  May be null in which

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Sun Feb 28 17:56:16 2010
@@ -35,13 +35,13 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ValueArrayCursor<K,V> extends AbstractCursor<Tuple>
+public class ValueArrayCursor<K, V> extends AbstractCursor<Tuple>
 {
     private static final int BEFORE_FIRST = -1;
 
     private final K key;
     private final List<V> values;
-    private final Tuple<K,V> tuple = new Tuple<K,V>();
+    private final Tuple<K, V> tuple = new Tuple<K, V>();
 
     private int pos = BEFORE_FIRST;
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Sun Feb 28 17:56:16 2010
@@ -37,17 +37,17 @@
 {
     private ClosureMonitor monitor = new DefaultClosureMonitor();
 
-    
+
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         if ( monitor == null )
         {
             throw new NullPointerException( "monitor" );
         }
-        
+
         this.monitor = monitor;
     }
-    
+
 
     protected final void checkNotClosed( String operation ) throws Exception
     {

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java Sun Feb 28 17:56:16 2010
@@ -33,11 +33,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public abstract class AbstractTupleCursor<K,V> implements TupleCursor<K,V>
+public abstract class AbstractTupleCursor<K, V> implements TupleCursor<K, V>
 {
     private ClosureMonitor monitor = new DefaultClosureMonitor();
 
-    
+
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         if ( monitor == null )
@@ -46,7 +46,7 @@
         }
         this.monitor = monitor;
     }
-    
+
 
     protected final void checkNotClosed( String operation ) throws Exception
     {
@@ -72,8 +72,8 @@
     }
 
 
-    public Iterator<Tuple<K,V>> iterator()
+    public Iterator<Tuple<K, V>> iterator()
     {
-        return new CursorIterator<Tuple<K,V>>( this );
+        return new CursorIterator<Tuple<K, V>>( this );
     }
 }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Sun Feb 28 17:56:16 2010
@@ -384,7 +384,7 @@
         store.move( moveContext.getDn(), moveContext.getParent() );
     }
 
-    
+
     /**
      * 
      * checks whether the moving of given entry is valid
@@ -399,10 +399,10 @@
 
         LdapDN newParentDNClone = ( LdapDN ) newParentDn.clone();
         newParentDNClone.remove( newParentDNClone.size() - 1 );
-        
-        if( newParentDn.size() >= oldChildDn.size() )
+
+        if ( newParentDn.size() >= oldChildDn.size() )
         {
-            for( int i=0; i < oldChildDn.size(); i++ )
+            for ( int i = 0; i < oldChildDn.size(); i++ )
             {
                 RDN nameRdn = oldChildDn.getRdn( i );
                 RDN ldapRdn = newParentDn.getRdn( i );
@@ -418,15 +418,16 @@
                 }
             }
         }
-        
-        if( invalid )
+
+        if ( invalid )
         {
-            throw new LdapOperationNotSupportedException( "cannot place an entry below itself", ResultCodeEnum.UNWILLING_TO_PERFORM );
+            throw new LdapOperationNotSupportedException( "cannot place an entry below itself",
+                ResultCodeEnum.UNWILLING_TO_PERFORM );
         }
-        
+
     }
 
-    
+
     public final void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId )
         throws Exception
     {

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Sun Feb 28 17:56:16 2010
@@ -18,31 +18,32 @@
  */
 package org.apache.directory.server.xdbm;
 
+
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
-
 /**
  * An empty Cursor implementation.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class EmptyIndexCursor<K,E> extends AbstractIndexCursor<K,E>
+public class EmptyIndexCursor<K, E> extends AbstractIndexCursor<K, E>
 {
     public boolean available()
     {
         return false;
     }
 
-    public void before( IndexEntry<K,E> element ) throws Exception
+
+    public void before( IndexEntry<K, E> element ) throws Exception
     {
         checkNotClosed( "before()" );
     }
 
 
-    public void after( IndexEntry<K,E> element ) throws Exception
+    public void after( IndexEntry<K, E> element ) throws Exception
     {
         checkNotClosed( "after()" );
     }
@@ -88,7 +89,7 @@
     }
 
 
-    public IndexEntry<K,E> get() throws Exception
+    public IndexEntry<K, E> get() throws Exception
     {
         checkNotClosed( "get()" );
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_703 ) );
@@ -100,11 +101,13 @@
         return false;
     }
 
+
     public void afterValue( Long id, K indexValue ) throws Exception
     {
         checkNotClosed( "after()" );
     }
 
+
     public void beforeValue( Long id, K indexValue ) throws Exception
     {
         checkNotClosed( "after()" );

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java Sun Feb 28 17:56:16 2010
@@ -27,10 +27,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ForwardIndexEntry<V,O> implements IndexEntry<V,O>
+public class ForwardIndexEntry<V, O> implements IndexEntry<V, O>
 {
     /** The underlying Tuple */
-    private final Tuple<V,Long> tuple = new Tuple<V,Long>();
+    private final Tuple<V, Long> tuple = new Tuple<V, Long>();
 
     /** The referenced obj if loaded from the store */
     private O obj;
@@ -44,7 +44,7 @@
      * @param tuple the tuple for the ForwardIndexEntry
      * @param entry the resusitated obj if any
      */
-    public void setTuple( Tuple<V,Long> tuple, O entry )
+    public void setTuple( Tuple<V, Long> tuple, O entry )
     {
         this.tuple.setKey( tuple.getKey() );
         this.tuple.setValue( tuple.getValue() );

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java Sun Feb 28 17:56:16 2010
@@ -38,12 +38,12 @@
 public interface Index<K, O>
 {
     int DEFAULT_INDEX_CACHE_SIZE = 100;
-    
+
+
     // -----------------------------------------------------------------------
     // C O N F I G U R A T I O N   M E T H O D S
     // -----------------------------------------------------------------------
 
-
     /**
      * Gets the attribute identifier set at configuration time for this index which may not
      * be the OID but an alias name for the attributeType associated with this Index
@@ -114,7 +114,6 @@
     // E N D   C O N F I G U R A T I O N   M E T H O D S
     // -----------------------------------------------------------------------
 
-
     /**
      * Gets the attribute this Index is built upon.
      *

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java Sun Feb 28 17:56:16 2010
@@ -19,9 +19,8 @@
  */
 package org.apache.directory.server.xdbm;
 
-import org.apache.directory.shared.ldap.cursor.Cursor;
-
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
 
 
 /**
@@ -31,7 +30,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface IndexCursor<V,E> extends Cursor<IndexEntry<V,E>>
+public interface IndexCursor<V, E> extends Cursor<IndexEntry<V, E>>
 {
     /**
      * An alternative to calling before(IndexEntry) which often may require

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java Sun Feb 28 17:56:16 2010
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public interface IndexEntry<V,O>
+public interface IndexEntry<V, O>
 {
     /**
      * Gets the value referred to by this IndexEntry.

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java Sun Feb 28 17:56:16 2010
@@ -44,7 +44,7 @@
      * 
      * @param indexName the name of the index that was not found 
      */
-    public IndexNotFoundException(String indexName)
+    public IndexNotFoundException( String indexName )
     {
         super( I18n.err( I18n.ERR_704, indexName ) );
         this.indexName = indexName;
@@ -57,7 +57,7 @@
      * @param message the message associated with the exception.
      * @param indexName the name of the index that was not found 
      */
-    public IndexNotFoundException(String message, String indexName)
+    public IndexNotFoundException( String message, String indexName )
     {
         super( message );
         this.indexName = indexName;
@@ -72,7 +72,7 @@
      * @param indexName the name of the index that was not found 
      * @param rootCause the root cause of this exception 
      */
-    public IndexNotFoundException(String message, String indexName, Throwable rootCause)
+    public IndexNotFoundException( String message, String indexName, Throwable rootCause )
     {
         this( message, indexName );
         setRootCause( rootCause );

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java Sun Feb 28 17:56:16 2010
@@ -27,10 +27,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ReverseIndexEntry<V,O> implements IndexEntry<V,O>
+public class ReverseIndexEntry<V, O> implements IndexEntry<V, O>
 {
     /** The underlying Tuple */
-    private final Tuple<Long,V> tuple = new Tuple<Long,V>();
+    private final Tuple<Long, V> tuple = new Tuple<Long, V>();
 
     /** The indexed object if loaded from the store */
     private O obj;
@@ -44,7 +44,7 @@
      * @param tuple the tuple for the ReverseIndexEntry
      * @param obj the resusitated object that is indexed if any
      */
-    public void setTuple( Tuple<Long,V> tuple, O obj )
+    public void setTuple( Tuple<Long, V> tuple, O obj )
     {
         this.tuple.setKey( tuple.getKey() );
         this.tuple.setValue( tuple.getValue() );

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Sun Feb 28 17:56:16 2010
@@ -18,12 +18,11 @@
  */
 package org.apache.directory.server.xdbm;
 
+
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
-
-
 /**
  * A Cursor over a single element.
  *
@@ -35,10 +34,10 @@
     private boolean beforeFirst = true;
     private boolean afterLast;
     private boolean onSingleton;
-    private final IndexEntry<K,E> singleton;
+    private final IndexEntry<K, E> singleton;
 
 
-    public SingletonIndexCursor( IndexEntry<K,E> singleton )
+    public SingletonIndexCursor( IndexEntry<K, E> singleton )
     {
         this.singleton = singleton;
     }
@@ -48,27 +47,27 @@
     {
         return onSingleton;
     }
-    
 
-    public void before( IndexEntry<K,E> element ) throws Exception
+
+    public void before( IndexEntry<K, E> element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
-    
-    
+
+
     public void beforeValue( Long id, K value ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
 
-    
+
     public void afterValue( Long id, K value ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
-    
 
-    public void after( IndexEntry<K,E> element ) throws Exception
+
+    public void after( IndexEntry<K, E> element ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -188,7 +187,7 @@
     }
 
 
-    public IndexEntry<K,E> get() throws Exception
+    public IndexEntry<K, E> get() throws Exception
     {
         checkNotClosed( "()" );
         if ( onSingleton )

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Sun Feb 28 17:56:16 2010
@@ -87,7 +87,6 @@
      * store and it's indices to conduct search operations.
      */
 
-
     /**
      * Sets the working directory for the store
      */
@@ -104,13 +103,13 @@
      * Stores the list of user index
      * @param userIndices The list of user index
      */
-    void setUserIndices( Set<Index<?,E>> userIndices );
+    void setUserIndices( Set<Index<?, E>> userIndices );
 
 
     /**
      * @return The list of user index
      */
-    Set<Index<?,E>> getUserIndices();
+    Set<Index<?, E>> getUserIndices();
 
 
     void setSuffixDn( String suffixDn );
@@ -201,7 +200,7 @@
      * @param index The index to add
      * @throws Exception If the addition failed
      */
-    void addIndex( Index<?,E> index ) throws Exception;
+    void addIndex( Index<?, E> index ) throws Exception;
 
 
     //------------------------------------------------------------------------
@@ -210,7 +209,7 @@
     /**
      * @return The Presence system index
      */
-    Index<String,E> getPresenceIndex();
+    Index<String, E> getPresenceIndex();
 
 
     /**
@@ -218,13 +217,13 @@
      * @param index The Presence index
      * @throws Exception If the addition failed
      */
-    void setPresenceIndex( Index<String,E> index ) throws Exception;
+    void setPresenceIndex( Index<String, E> index ) throws Exception;
 
 
     /**
      * @return The OneLevel system index
      */
-    Index<Long,E> getOneLevelIndex();
+    Index<Long, E> getOneLevelIndex();
 
 
     /**
@@ -232,13 +231,13 @@
      * @param index The OneLevel index
      * @throws Exception If the addition failed
      */
-    void setOneLevelIndex( Index<Long,E> index ) throws Exception;
+    void setOneLevelIndex( Index<Long, E> index ) throws Exception;
 
 
     /**
      * @return The SubLevel system index
      */
-    Index<Long,E> getSubLevelIndex();
+    Index<Long, E> getSubLevelIndex();
 
 
     /**
@@ -246,13 +245,13 @@
      * @param index The SubLevel index
      * @throws Exception If the addition failed
      */
-    void setSubLevelIndex( Index<Long,E> index ) throws Exception;
+    void setSubLevelIndex( Index<Long, E> index ) throws Exception;
 
 
     /**
      * @return The Alias system index
      */
-    Index<String,E> getAliasIndex();
+    Index<String, E> getAliasIndex();
 
 
     /**
@@ -260,13 +259,13 @@
      * @param index The Alias index
      * @throws Exception If the addition failed
      */
-    void setAliasIndex( Index<String,E> index ) throws Exception;
+    void setAliasIndex( Index<String, E> index ) throws Exception;
 
 
     /**
      * @return The OneAlias system index
      */
-    Index<Long,E> getOneAliasIndex();
+    Index<Long, E> getOneAliasIndex();
 
 
     /**
@@ -274,13 +273,13 @@
      * @param index The OneAlias index
      * @throws Exception If the addition failed
      */
-    void setOneAliasIndex( Index<Long,E> index ) throws Exception;
+    void setOneAliasIndex( Index<Long, E> index ) throws Exception;
 
 
     /**
      * @return The SubAlias system index
      */
-    Index<Long,E> getSubAliasIndex();
+    Index<Long, E> getSubAliasIndex();
 
 
     /**
@@ -288,13 +287,13 @@
      * @param index The SubAlias index
      * @throws Exception If the addition failed
      */
-    void setSubAliasIndex( Index<Long,E> index ) throws Exception;
+    void setSubAliasIndex( Index<Long, E> index ) throws Exception;
 
 
     /**
      * @return The UpDN system index
      */
-    Index<String,E> getUpdnIndex();
+    Index<String, E> getUpdnIndex();
 
 
     /**
@@ -302,13 +301,13 @@
      * @param index The UpDn index
      * @throws Exception If the addition failed
      */
-    void setUpdnIndex( Index<String,E> index ) throws Exception;
+    void setUpdnIndex( Index<String, E> index ) throws Exception;
 
 
     /**
      * @return The Ndn system index
      */
-    Index<String,E> getNdnIndex();
+    Index<String, E> getNdnIndex();
 
 
     /**
@@ -316,51 +315,55 @@
      * @param index The NDN index
      * @throws Exception If the addition failed
      */
-    void setNdnIndex( Index<String,E> index ) throws Exception;
+    void setNdnIndex( Index<String, E> index ) throws Exception;
 
 
     /**
      * @return The ObjectClass system index
      */
-    Index<String,E> getObjectClassIndex();
+    Index<String, E> getObjectClassIndex();
+
 
     /**
      * Set the ObjectClass index
      * @param index The ObjectClass index
      * @throws Exception If the addition failed
      */
-    void setObjectClassIndex( Index<String,E> index ) throws Exception;
+    void setObjectClassIndex( Index<String, E> index ) throws Exception;
+
 
-    
     /**
      * @return The EntryUUID system index
      */
-    Index<String,E> getEntryUuidIndex();
+    Index<String, E> getEntryUuidIndex();
+
 
     /**
      * Set the EntryUUID index
      * @param index The EntryUUID index
      * @throws Exception If the addition failed
      */
-    void setEntryUuidIndex( Index<String,E> index ) throws Exception;
+    void setEntryUuidIndex( Index<String, E> index ) throws Exception;
+
 
-    
     /**
      * @return The EntryCSN system index
      */
-    Index<String,E> getEntryCsnIndex();
+    Index<String, E> getEntryCsnIndex();
+
 
     /**
      * Set the EntryCSN index
      * @param index The EntryCSN index
      * @throws Exception If the addition failed
      */
-    void setEntryCsnIndex( Index<String,E> index ) throws Exception;
+    void setEntryCsnIndex( Index<String, E> index ) throws Exception;
+
 
     //------------------------------------------------------------------------
     // End of the system index
     //------------------------------------------------------------------------
-    
+
     /**
      * An iterator build on top of the User's index
      */
@@ -399,7 +402,7 @@
      * @return The associated user index
      * @throws IndexNotFoundException If the index does not exist
      */
-    Index<?,E> getUserIndex( String id ) throws IndexNotFoundException;
+    Index<?, E> getUserIndex( String id ) throws IndexNotFoundException;
 
 
     /**
@@ -408,7 +411,7 @@
      * @return The associated user index
      * @throws IndexNotFoundException If the index does not exist
      */
-    Index<?,E> getSystemIndex( String id ) throws IndexNotFoundException;
+    Index<?, E> getSystemIndex( String id ) throws IndexNotFoundException;
 
 
     Long getEntryId( String dn ) throws Exception;
@@ -470,7 +473,7 @@
      * @return an IndexEntry Cursor over the child entries
      * @throws Exception on failures to access the underlying store
      */
-    IndexCursor<Long,E> list( Long id ) throws Exception;
+    IndexCursor<Long, E> list( Long id ) throws Exception;
 
 
     int getChildCount( Long id ) throws Exception;

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java Sun Feb 28 17:56:16 2010
@@ -20,7 +20,6 @@
 package org.apache.directory.server.xdbm;
 
 
-
 import java.util.Comparator;
 
 import org.apache.directory.shared.ldap.cursor.Cursor;
@@ -71,7 +70,7 @@
      */
     boolean isDupsEnabled();
 
-    
+
     /**
      * Checks whether or not calls to count the number of keys greater than or
      * less than the key are exact.
@@ -84,13 +83,12 @@
      * @return true if the count is an exact value or a worst case guess 
      */
     boolean isCountExact();
-    
+
 
     // ------------------------------------------------------------------------
     // Simple Table Key/Value Assertions 
     // ------------------------------------------------------------------------
 
-    
     /**
      * Checks to see if this table has one or more tuples with a specific key:
      * this is exactly the same as a get call with a check to see if the
@@ -248,7 +246,7 @@
      * @return a Cursor over Tuples containing the key value pairs
      * @throws Exception if there are failures accessing underlying stores
      */
-    Cursor<Tuple<K,V>> cursor() throws Exception;
+    Cursor<Tuple<K, V>> cursor() throws Exception;
 
 
     /**
@@ -264,7 +262,7 @@
      * @return a Cursor over Tuples containing the same key
      * @throws Exception if there are failures accessing underlying stores
      */
-    Cursor<Tuple<K,V>> cursor( K key ) throws Exception;
+    Cursor<Tuple<K, V>> cursor( K key ) throws Exception;
 
 
     /**
@@ -288,7 +286,6 @@
     // Table Record Count Methods
     // ------------------------------------------------------------------------
 
-    
     /**
      * Gets the count of the number of records in this Table.
      *

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java Sun Feb 28 17:56:16 2010
@@ -73,7 +73,7 @@
      * @param key the new key to set
      * @return this Tuple itself to set and return
      */
-    public Tuple<K,V> setKey( K key )
+    public Tuple<K, V> setKey( K key )
     {
         this.key = key;
         return this;
@@ -97,7 +97,7 @@
      * @param value the new value to set
      * @return this Tuple itself to set and return
      */
-    public Tuple<K,V> setValue( V value )
+    public Tuple<K, V> setValue( V value )
     {
         this.value = value;
         return this;
@@ -113,7 +113,7 @@
      * @param value the new value to set
      * @return this Tuple itself to set and return
      */
-    public Tuple<K,V> setBoth( K key, V value )
+    public Tuple<K, V> setBoth( K key, V value )
     {
         this.key = key;
         this.value = value;
@@ -121,8 +121,6 @@
     }
 
 
-
-
     /**
      * Sets both the key and the value for this Tuple in one call and returns
      * this Tuple object.  This is useful for setting the tuples key and value
@@ -131,7 +129,7 @@
      * @param tupleToCopy the tuple to copy
      * @return this Tuple itself to set and return
      */
-    public Tuple<K,V> setBoth( Tuple<K,V> tupleToCopy )
+    public Tuple<K, V> setBoth( Tuple<K, V> tupleToCopy )
     {
         this.key = tupleToCopy.key;
         this.value = tupleToCopy.value;
@@ -144,7 +142,7 @@
         StringBuilder buf = new StringBuilder();
         buf.append( "Tuple( '" );
         buf.append( key );
-        buf.append(  "', '" );
+        buf.append( "', '" );
         buf.append( value );
         buf.append( "' )" );
         return buf.toString();

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java Sun Feb 28 17:56:16 2010
@@ -19,9 +19,8 @@
  */
 package org.apache.directory.server.xdbm;
 
-import org.apache.directory.shared.ldap.cursor.Cursor;
-
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
 
 
 /**
@@ -31,7 +30,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public interface TupleCursor<K,V> extends Cursor<Tuple<K,V>>
+public interface TupleCursor<K, V> extends Cursor<Tuple<K, V>>
 {
     /**
      * An alternative to calling before(Tuple) which often may require

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java Sun Feb 28 17:56:16 2010
@@ -49,7 +49,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Evaluator<N extends ExprNode,E>
+public interface Evaluator<N extends ExprNode, E>
 {
     /**
      * Evaluates a candidate to determine if a filter expression selects it.

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=917231&r1=917230&r2=917231&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Sun Feb 28 17:56:16 2010
@@ -84,10 +84,8 @@
      * @return enumeration over SearchResults
      * @throws Exception if the search fails
      */
-    IndexCursor<Long,E> cursor( LdapDN base,
-                             AliasDerefMode aliasDerefMode,
-                             ExprNode filter,
-                             SearchControls searchCtls ) throws Exception;
+    IndexCursor<Long, E> cursor( LdapDN base, AliasDerefMode aliasDerefMode, ExprNode filter, SearchControls searchCtls )
+        throws Exception;
 
 
     /**



Mime
View raw message