directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1551470 - in /directory/mavibot/trunk/mavibot/src: main/java/org/apache/directory/mavibot/btree/ test/java/org/apache/directory/mavibot/btree/
Date Tue, 17 Dec 2013 07:04:52 GMT
Author: elecharny
Date: Tue Dec 17 07:04:52 2013
New Revision: 1551470

URL: http://svn.apache.org/r1551470
Log:
Made many methods and classes package protected. Some javadoc cleanup

Modified:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTree.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeFactory.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryLeaf.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryNode.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageIO.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedLeaf.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedNode.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueHolder.java
    directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java Tue Dec 17 07:04:52 2013
@@ -235,13 +235,13 @@ import org.apache.directory.mavibot.btre
      * @param key The key for the entry we try to remove
      * @return A Tuple<K, V> containing the removed entry, or null if it's not found.
      */
-    protected Tuple<K, V> delete( K key, long revision ) throws IOException
+    /*no qualifier*/ Tuple<K, V> delete( K key, long revision ) throws IOException
     {
         return delete( key, null, revision );
     }
 
 
-    abstract protected Tuple<K, V> delete( K key, V value, long revision ) throws IOException;
+    /*no qualifier*/abstract Tuple<K, V> delete( K key, V value, long revision ) throws IOException;
     
     
     /**
@@ -314,7 +314,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public void setRootPage( Page<K, V> root )
+    /* no qualifier */void setRootPage( Page<K, V> root )
     {
         rootPage = root;
     }
@@ -428,16 +428,18 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public void setRevision( long revision )
+    /* no qualifier */void setRevision( long revision )
     {
         btreeHeader.setRevision( revision );
     }
 
 
     /**
-     * {@inheritDoc}
+     * Generates a new revision number. It's only used by the Page instances.
+     * 
+     * @return a new incremental revision number
      */
-    public long generateRevision()
+    /* no qualifier */long generateRevision()
     {
         return btreeHeader.incrementRevision();
     }
@@ -473,7 +475,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public void setNbElems( long nbElems )
+    /* no qualifier */void setNbElems( long nbElems )
     {
         btreeHeader.setNbElems( nbElems );
     }
@@ -588,7 +590,7 @@ import org.apache.directory.mavibot.btre
      * Create a thread that is responsible of cleaning the transactions when
      * they hit the timeout
      */
-    protected void createTransactionManager()
+    /*no qualifier*/ void createTransactionManager()
     {
         Runnable readTransactionTask = new Runnable()
         {

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java Tue Dec 17 07:04:52 2013
@@ -57,7 +57,7 @@ import java.util.List;
      * @param modifiedSibling The modified sibling
      * @param removedElement The removed element (can be null if the key wasn't present in the tree)
      */
-    public AbstractBorrowedFromSiblingResult( Page<K, V> modifiedPage, Page<K, V> modifiedSibling,
+    /* No qualifier*/ AbstractBorrowedFromSiblingResult( Page<K, V> modifiedPage, Page<K, V> modifiedSibling,
         Tuple<K, V> removedElement, SiblingPosition position )
     {
         super( modifiedPage, removedElement );
@@ -74,7 +74,7 @@ import java.util.List;
      * @param modifiedSibling The modified sibling
      * @param removedElement The removed element (can be null if the key wasn't present in the tree)
      */
-    public AbstractBorrowedFromSiblingResult( List<Page<K, V>> copiedPages, Page<K, V> modifiedPage,
+    /* No qualifier*/ AbstractBorrowedFromSiblingResult( List<Page<K, V>> copiedPages, Page<K, V> modifiedPage,
         Page<K, V> modifiedSibling,
         Tuple<K, V> removedElement, SiblingPosition position )
     {

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java Tue Dec 17 07:04:52 2013
@@ -47,7 +47,7 @@ import java.util.List;
      * @param modifiedPage The modified page
      * @param removedElement The removed element (can be null if the key wasn't present in the tree)
      */
-    public AbstractDeleteResult( Page<K, V> modifiedPage, Tuple<K, V> removedElement )
+    /*no qualifier*/ AbstractDeleteResult( Page<K, V> modifiedPage, Tuple<K, V> removedElement )
     {
         super();
         this.modifiedPage = modifiedPage;
@@ -62,7 +62,7 @@ import java.util.List;
      * @param modifiedPage The modified page
      * @param removedElement The removed element (can be null if the key wasn't present in the tree)
      */
-    public AbstractDeleteResult( List<Page<K, V>> copiedPages, Page<K, V> modifiedPage,
+    /*no qualifier*/ AbstractDeleteResult( List<Page<K, V>> copiedPages, Page<K, V> modifiedPage,
         Tuple<K, V> removedElement )
     {
         super( copiedPages );
@@ -92,7 +92,7 @@ import java.util.List;
     /**
      * @param modifiedPage the modifiedPage to set
      */
-    public void setModifiedPage( Page<K, V> modifiedPage )
+    /*no qualifier*/ void setModifiedPage( Page<K, V> modifiedPage )
     {
         this.modifiedPage = modifiedPage;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java Tue Dec 17 07:04:52 2013
@@ -88,6 +88,7 @@ import org.apache.directory.mavibot.btre
         this.keys = ( KeyHolder[] ) Array.newInstance( KeyHolder.class, nbElems );
     }
 
+
     /**
      * {@inheritDoc}
      */
@@ -97,7 +98,11 @@ import org.apache.directory.mavibot.btre
     }
 
 
-    public void setNbElems( int nbElems )
+    /**
+     * Sets the number of element in this page
+     * @param nbElems The number of elements
+     */
+    /* no qualifier */void setNbElems( int nbElems )
     {
         this.nbElems = nbElems;
     }
@@ -150,7 +155,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public Page<K, V> getReference( int pos ) throws IOException
+    /* no qualifier */Page<K, V> getReference( int pos ) throws IOException
     {
         if ( pos < nbElems + 1 )
         {
@@ -229,7 +234,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public Page<K, V> getPage( int pos )
+    /* no qualifier */Page<K, V> getPage( int pos )
     {
         if ( ( pos >= 0 ) && ( pos < children.length ) )
         {
@@ -245,7 +250,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public void setPageHolder( int pos, PageHolder<K, V> pageHolder )
+    /* no qualifier */void setPageHolder( int pos, PageHolder<K, V> pageHolder )
     {
         if ( ( pos >= 0 ) && ( pos < children.length ) )
         {
@@ -350,9 +355,9 @@ import org.apache.directory.mavibot.btre
 
 
     /**
-     * {@inheritDoc}
+     * @return the offset of the first {@link PageIO} which stores the Page on disk.
      */
-    public long getOffset()
+    /* no qualifier */long getOffset()
     {
         return offset;
     }
@@ -361,16 +366,16 @@ import org.apache.directory.mavibot.btre
     /**
      * @param offset the offset to set
      */
-    public void setOffset( long offset )
+    /* no qualifier */void setOffset( long offset )
     {
         this.offset = offset;
     }
 
 
     /**
-     * {@inheritDoc}
+     * @return the offset of the last {@link PageIO} which stores the Page on disk.
      */
-    public long getLastOffset()
+    /* no qualifier */long getLastOffset()
     {
         return lastOffset;
     }
@@ -379,16 +384,16 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public void setLastOffset( long lastOffset )
+    /* no qualifier */void setLastOffset( long lastOffset )
     {
         this.lastOffset = lastOffset;
     }
 
 
     /**
-     * @return the leys
+     * @return the keys
      */
-    public KeyHolder<K>[] getKeys()
+    /* no qualifier */KeyHolder<K>[] getKeys()
     {
         return keys;
     }
@@ -400,7 +405,7 @@ import org.apache.directory.mavibot.btre
      * @param pos The position in the keys array
      * @param key the key to inject
      */
-    public void setKey( int pos, KeyHolder<K> key )
+    /* no qualifier */void setKey( int pos, KeyHolder<K> key )
     {
         keys[pos] = key;
     }
@@ -409,7 +414,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param revision the keys to set
      */
-    public void setKeys( KeyHolder<K>[] keys )
+    /* no qualifier */void setKeys( KeyHolder<K>[] keys )
     {
         this.keys = keys;
     }
@@ -418,7 +423,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public ValueHolder<V> getValue( int pos )
+    /* no qualifier */ValueHolder<V> getValue( int pos )
     {
         // Node don't have values. Leaf.getValue() will return the value
         return null;
@@ -437,7 +442,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param revision the revision to set
      */
-    public void setRevision( long revision )
+    /* no qualifier */void setRevision( long revision )
     {
         this.revision = revision;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java Tue Dec 17 07:04:52 2013
@@ -96,7 +96,7 @@ import java.util.List;
                 sb.append( ", " );
             }
 
-            sb.append( copiedPage.getOffset() );
+            sb.append( ((AbstractPage<K, V>)copiedPage).getOffset() );
         }
 
         sb.append( ">" );

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTree.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTree.java Tue Dec 17 07:04:52 2013
@@ -82,14 +82,6 @@ public interface BTree<K, V>
 
 
     /**
-     * Generates a new revision number. It's only used by the Page instances.
-     * 
-     * @return a new incremental revision number
-     */
-    long generateRevision();
-
-
-    /**
      * Insert an entry in the BTree.
      * <p>
      * We will replace the value if the provided key already exists in the
@@ -115,7 +107,7 @@ public interface BTree<K, V>
      * @return Existing value, if any.
      * @throws IOException TODO
      */
-    InsertResult<K, V> insert( K key, V value, long revision ) throws IOException;
+    //InsertResult<K, V> insert( K key, V value, long revision ) throws IOException;
 
 
     /**
@@ -174,15 +166,6 @@ public interface BTree<K, V>
 
 
     /**
-     * Set the new root page for this tree. Used for debug purpose only. The revision
-     * will always be 0;
-     * 
-     * @param root the new root page.
-     */
-    void setRootPage( Page<K, V> root );
-
-
-    /**
      * @see Page#getValues(Object)
      */
     ValueCursor<V> getValues( K key ) throws IOException, KeyNotFoundException;
@@ -382,23 +365,11 @@ public interface BTree<K, V>
 
 
     /** 
-     * @param The current BTree revision
-     */
-    void setRevision( long revision);
-
-
-    /** 
      * @return The current number of elements in the BTree
      */
     long getNbElems();
 
 
-    /** 
-     * @return The current number of elements in the BTree
-     */
-    void setNbElems( long nbElems);
-
-
     /**
      * @return true if this BTree allow duplicate values
      */

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java Tue Dec 17 07:04:52 2013
@@ -105,7 +105,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param name the name to set
      */
-    public void setName( String name )
+    /* no qualifier */void setName( String name )
     {
         this.name = name;
     }
@@ -123,7 +123,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param versions the versions to set
      */
-    public void setVersions( long[] versions )
+    /* no qualifier */void setVersions( long[] versions )
     {
         this.versions = versions;
     }
@@ -141,7 +141,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param btreeOffset the btreeOffset to set
      */
-    public void setBTreeOffset( long btreeOffset )
+    /* no qualifier */void setBTreeOffset( long btreeOffset )
     {
         this.btreeOffset = btreeOffset;
     }
@@ -159,7 +159,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param rootPageOffset the rootPageOffset to set
      */
-    public void setRootPageOffset( long rootPageOffset )
+    /* no qualifier */void setRootPageOffset( long rootPageOffset )
     {
         this.rootPageOffset = rootPageOffset;
     }
@@ -177,7 +177,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param revision the revision to set
      */
-    public void setRevision( long revision )
+    /* no qualifier */void setRevision( long revision )
     {
         this.revision.set( revision );
     }
@@ -188,7 +188,7 @@ import java.util.concurrent.atomic.Atomi
      * 
      * @return the new revision
      */
-    public long incrementRevision()
+    /* no qualifier */long incrementRevision()
     {
         return revision.incrementAndGet();
     }
@@ -206,7 +206,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * Increment the number of elements
      */
-    public void incrementNbElems()
+    /* no qualifier */void incrementNbElems()
     {
         nbElems.incrementAndGet();
     }
@@ -224,7 +224,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param nbElems the nbElems to set
      */
-    public void setNbElems( long nbElems )
+    /* no qualifier */void setNbElems( long nbElems )
     {
         this.nbElems.set( nbElems );
     }
@@ -242,7 +242,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param nextBtreeOffset the nextBtreeOffset to set
      */
-    public void setNextBTreeOffset( long nextBTreeOffset )
+    /* no qualifier */void setNextBTreeOffset( long nextBTreeOffset )
     {
         this.nextBTreeOffset = nextBTreeOffset;
     }
@@ -260,7 +260,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param pageSize the pageSize to set
      */
-    public void setPageSize( int pageSize )
+    /* no qualifier */void setPageSize( int pageSize )
     {
         this.pageSize = pageSize;
     }
@@ -278,7 +278,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param keySerializerFQCN the keySerializerFQCN to set
      */
-    public void setKeySerializerFQCN( String keySerializerFQCN )
+    /* no qualifier */void setKeySerializerFQCN( String keySerializerFQCN )
     {
         this.keySerializerFQCN = keySerializerFQCN;
     }
@@ -296,7 +296,7 @@ import java.util.concurrent.atomic.Atomi
     /**
      * @param valueSerializerFQCN the valueSerializerFQCN to set
      */
-    public void setValueSerializerFQCN( String valueSerializerFQCN )
+    /* no qualifier */void setValueSerializerFQCN( String valueSerializerFQCN )
     {
         this.valueSerializerFQCN = valueSerializerFQCN;
     }
@@ -308,7 +308,7 @@ import java.util.concurrent.atomic.Atomi
     }
 
 
-    public void setAllowDuplicates( boolean allowDuplicates )
+    /* no qualifier */void setAllowDuplicates( boolean allowDuplicates )
     {
         this.allowDuplicates = ( allowDuplicates ? 1 : 0 );
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilder.java Tue Dec 17 07:04:52 2013
@@ -126,7 +126,7 @@ public class InMemoryBTreeBuilder<K, V>
 
         System.out.println("built rootpage : " + rootPage);
         
-        btree.setRootPage( rootPage );
+        ((AbstractBTree<K, V>)btree).setRootPage( rootPage );
 
         return btree;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeFactory.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeFactory.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeFactory.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeFactory.java Tue Dec 17 07:04:52 2013
@@ -87,9 +87,9 @@ public class InMemoryBTreeFactory
      * 
      * @param root the new root page.
      */
-    public static <K, V> void setRoot( BTree<K, V> btree, Page<K, V> root )
+    /* no qualifier*/ static <K, V> void setRoot( BTree<K, V> btree, Page<K, V> root )
     {
-        btree.setRootPage( root );
+        ((AbstractBTree<K, V>)btree).setRootPage( root );
     }
 
 
@@ -108,18 +108,18 @@ public class InMemoryBTreeFactory
     /**
      * @param nbElems the nbElems to set
      */
-    public static <K, V> void setNbElems( BTree<K, V> btree, long nbElems )
+    /* no qualifier */static <K, V> void setNbElems( BTree<K, V> btree, long nbElems )
     {
-        btree.setNbElems( nbElems );
+        ((AbstractBTree<K, V>)btree).setNbElems( nbElems );
     }
 
 
     /**
      * @param revision the revision to set
      */
-    public static <K, V> void setRevision( BTree<K, V> btree, long revision )
+    /* no qualifier*/static <K, V> void setRevision( BTree<K, V> btree, long revision )
     {
-        btree.setRevision( revision );
+        ((AbstractBTree<K, V>)btree).setRevision( revision );
     }
 
 

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryLeaf.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryLeaf.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryLeaf.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryLeaf.java Tue Dec 17 07:04:52 2013
@@ -550,7 +550,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public ValueHolder<V> getValue( int pos )
+    /* no qualifier */ValueHolder<V> getValue( int pos )
     {
         if ( pos < nbElems )
         {
@@ -568,7 +568,7 @@ import org.apache.directory.mavibot.btre
      * @param pos The position in the values array
      * @param value the value to inject
      */
-    public void setValue( int pos, InMemoryValueHolder<V> value )
+    /* no qualifier */void setValue( int pos, InMemoryValueHolder<V> value )
     {
         values[pos] = value;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryNode.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryNode.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryNode.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryNode.java Tue Dec 17 07:04:52 2013
@@ -783,7 +783,7 @@ import java.util.List;
      * @param pos The position in the values array
      * @param value the value to inject
      */
-    public void setValue( int pos, Page<K, V> value )
+    /* no qualifier */void setValue( int pos, Page<K, V> value )
     {
         children[pos] = new PageHolder<K, V>( btree, value );
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java Tue Dec 17 07:04:52 2013
@@ -37,7 +37,7 @@ package org.apache.directory.mavibot.btr
      * 
      * @param key The key to store
      */
-    public KeyHolder( K key )
+    /* no qualifier */KeyHolder( K key )
     {
         this.key = key;
     }
@@ -46,7 +46,7 @@ package org.apache.directory.mavibot.btr
     /**
      * {@inheritDoc}
      */
-    public void setKey( K key )
+    /* no qualifier */void setKey( K key )
     {
         this.key = key;
     }
@@ -55,7 +55,7 @@ package org.apache.directory.mavibot.btr
     /**
      * {@inheritDoc}
      */
-    public K getKey()
+    /* no qualifier */K getKey()
     {
         return key;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java Tue Dec 17 07:04:52 2013
@@ -256,16 +256,4 @@ import org.apache.directory.mavibot.btre
      * @throws IOException If we have an error while trying to access the page
      */
     boolean hasKey( K key ) throws IOException;
-
-
-    /**
-     * @return the offset of the first {@link PageIO} which stores the Page on disk.
-     */
-    long getOffset();
-
-
-    /**
-     * @return the offset of the last {@link PageIO} which stores the Page on disk.
-     */
-    long getLastOffset();
 }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java Tue Dec 17 07:04:52 2013
@@ -41,7 +41,7 @@ package org.apache.directory.mavibot.btr
      * @param btree The associated BTree
      * @param page The element to store into a SoftReference
      **/
-    public PageHolder( BTree<K, V> btree, Page<K, V> page )
+    /* no qualifier */PageHolder( BTree<K, V> btree, Page<K, V> page )
     {
         this.btree = btree;
         this.page = page;
@@ -51,7 +51,7 @@ package org.apache.directory.mavibot.btr
     /**
      * @return the stored page
      */
-    public Page<K, V> getValue()
+    /* no qualifier */Page<K, V> getValue()
     {
         return page;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageIO.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageIO.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageIO.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageIO.java Tue Dec 17 07:04:52 2013
@@ -73,7 +73,7 @@ import org.apache.directory.mavibot.btre
     /** 
      * A default constructor for a PageIO
      */
-    public PageIO()
+    /* no qualifier */PageIO()
     {
         nextPage = -2L;
         size = -1;
@@ -84,7 +84,7 @@ import org.apache.directory.mavibot.btre
     /** 
      * A constructor for a PageIO when we know the offset of this page on disk
      */
-    public PageIO( long offset )
+    /* no qualifier */PageIO( long offset )
     {
         nextPage = -2L;
         size = -1;
@@ -95,7 +95,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @return the data
      */
-    public ByteBuffer getData()
+    /* no qualifier */ByteBuffer getData()
     {
         return data;
     }
@@ -104,7 +104,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param data the data to set
      */
-    public void setData( ByteBuffer data )
+    /* no qualifier */void setData( ByteBuffer data )
     {
         this.data = data;
         nextPage = data.getLong( 0 );
@@ -115,7 +115,7 @@ import org.apache.directory.mavibot.btre
      * Get the NextPage value from the PageIO. If it's -1, there is no next page<br/>
      * @return the nextPage
      */
-    public long getNextPage()
+    /* no qualifier */long getNextPage()
     {
         return nextPage;
     }
@@ -124,7 +124,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param nextPage the nextPage to set
      */
-    public void setNextPage( long nextPage )
+    /* no qualifier */void setNextPage( long nextPage )
     {
         this.nextPage = nextPage;
 
@@ -135,7 +135,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @return the size
      */
-    public long getSize()
+    /* no qualifier */long getSize()
     {
         return size;
     }
@@ -144,7 +144,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param size the size to set
      */
-    public void setSize( int size )
+    /* no qualifier */void setSize( int size )
     {
         data.putInt( 8, size );
 
@@ -155,7 +155,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param size the size to set
      */
-    public void setSize()
+    /* no qualifier */void setSize()
     {
         size = data.getInt( 8 );
     }
@@ -164,7 +164,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @return the offset
      */
-    public long getOffset()
+    /* no qualifier */long getOffset()
     {
         return offset;
     }
@@ -173,7 +173,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param offset the offset to set
      */
-    public void setOffset( long offset )
+    /* no qualifier */void setOffset( long offset )
     {
         this.offset = offset;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java Tue Dec 17 07:04:52 2013
@@ -33,16 +33,16 @@ package org.apache.directory.mavibot.btr
 /* No qualifier*/class ParentPos<K, V>
 {
     /** The page we are browsing */
-    public Page<K, V> page;
+    /* no qualifier */Page<K, V> page;
 
     /** The current position in the page */
-    public int pos;
+    /* no qualifier */int pos;
 
     /** The current position of the duplicate container in the page */
-    public int dupPos;
+    /* no qualifier */int dupPos;
 
     /** The current position of the duplicate container in the page */
-    public ValueCursor<V> valueCursor;
+    /* no qualifier */ValueCursor<V> valueCursor;
 
 
     /**
@@ -50,7 +50,7 @@ package org.apache.directory.mavibot.btr
      * @param page The current Page
      * @param pos The current position in the page
      */
-    public ParentPos( Page<K, V> page, int pos )
+    /* no qualifier */ParentPos( Page<K, V> page, int pos )
     {
         this.page = page;
         this.pos = pos;

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilder.java Tue Dec 17 07:04:52 2013
@@ -145,7 +145,7 @@ public class PersistedBTreeBuilder<K, V>
         
         rm.addFreePages( btree, Arrays.asList( btree.getRootPage() ) );
         
-        btree.setRootPage( rootPage );
+        ((AbstractBTree<K, V>)btree).setRootPage( rootPage );
         
         return btree;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java Tue Dec 17 07:04:52 2013
@@ -100,9 +100,9 @@ public class PersistedBTreeFactory
      * 
      * @param root the new root page.
      */
-    public static <K, V> void setRootPage( BTree<K, V> btree, Page<K, V> root )
+    /* no qualifier*/ static <K, V> void setRootPage( BTree<K, V> btree, Page<K, V> root )
     {
-        btree.setRootPage( root );
+        ((AbstractBTree<K, V>)btree).setRootPage( root );
     }
 
 
@@ -139,7 +139,7 @@ public class PersistedBTreeFactory
     /**
      * @param rootPageOffset the rootPageOffset to set
      */
-    public static <K, V> void setRootPageOffset( BTree<K, V> btree, long rootPageOffset )
+    /* no qualifier*/static <K, V> void setRootPageOffset( BTree<K, V> btree, long rootPageOffset )
     {
         ((PersistedBTree<K, V>)btree).setRootPageOffset( rootPageOffset );
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java Tue Dec 17 07:04:52 2013
@@ -46,7 +46,7 @@ import org.apache.directory.mavibot.btre
      * @param keySerializer The KeySerializer instance
      * @param key The key to store
      */
-    PersistedKeyHolder( ElementSerializer<K> keySerializer, K key )
+    /* no qualifier */PersistedKeyHolder( ElementSerializer<K> keySerializer, K key )
     {
         super( key );
         this.keySerializer = keySerializer;
@@ -59,7 +59,7 @@ import org.apache.directory.mavibot.btre
      * @param keySerializer The KeySerializer instance
      * @param raw the bytes representing the serialized key
      */
-    PersistedKeyHolder( ElementSerializer<K> keySerializer, byte[] raw )
+    /* no qualifier */PersistedKeyHolder( ElementSerializer<K> keySerializer, byte[] raw )
     {
         super( null );
         this.keySerializer = keySerializer;
@@ -70,7 +70,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @return the key
      */
-    public K getKey()
+    /* no qualifier */K getKey()
     {
         if ( key == null )
         {
@@ -91,7 +91,7 @@ import org.apache.directory.mavibot.btre
     /**
      * @param key the Key to store in into the KeyHolder
      */
-    public void setKey( K key )
+    /* no qualifier */void setKey( K key )
     {
         this.key = key;
         raw = keySerializer.serialize( key );

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedLeaf.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedLeaf.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedLeaf.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedLeaf.java Tue Dec 17 07:04:52 2013
@@ -597,7 +597,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public ValueHolder<V> getValue( int pos )
+    /* no qualifier */ValueHolder<V> getValue( int pos )
     {
         if ( pos < nbElems )
         {
@@ -615,7 +615,7 @@ import org.apache.directory.mavibot.btre
      * @param pos The position in the values array
      * @param value the value to inject
      */
-    public void setValue( int pos, ValueHolder<V> value )
+    /* no qualifier */void setValue( int pos, ValueHolder<V> value )
     {
         values[pos] = value;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedNode.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedNode.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedNode.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedNode.java Tue Dec 17 07:04:52 2013
@@ -842,7 +842,7 @@ import java.util.List;
      * @param pos The position in the values array
      * @param value the value to inject
      */
-    public void setValue( int pos, PersistedPageHolder<K, V> value )
+    /* no qualifier */void setValue( int pos, PersistedPageHolder<K, V> value )
     {
         children[pos] = value;
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java Tue Dec 17 07:04:52 2013
@@ -64,8 +64,8 @@ import org.apache.directory.mavibot.btre
         super( btree, page );
         cache = ((PersistedBTree<K, V>)btree).getCache();
         recordManager = ((PersistedBTree<K, V>)btree).getRecordManager();
-        offset = page.getOffset();
-        lastOffset = page.getLastOffset();
+        offset = ((AbstractPage<K, V>)page).getOffset();
+        lastOffset = ((AbstractPage<K, V>)page).getLastOffset();
 
         if ( page instanceof Page<?, ?> )
         {

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java Tue Dec 17 07:04:52 2013
@@ -37,7 +37,7 @@ package org.apache.directory.mavibot.btr
      * @param key The key being added
      * @param value The value being added
      */
-    public PoisonPill()
+    /* no qualifier */PoisonPill()
     {
         super( null, null );
     }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java Tue Dec 17 07:04:52 2013
@@ -1266,12 +1266,12 @@ public class RecordManager
         Page<K, V> child = node.getReference( pos );
 
         // The first offset
-        byte[] buffer = LongSerializer.serialize( child.getOffset() );
+        byte[] buffer = LongSerializer.serialize( ((AbstractPage<K, V>)child).getOffset() );
         serializedData.add( buffer );
         int dataSize = buffer.length;
 
         // The last offset
-        buffer = LongSerializer.serialize( child.getLastOffset() );
+        buffer = LongSerializer.serialize( ((AbstractPage<K, V>)child).getLastOffset() );
         serializedData.add( buffer );
         dataSize += buffer.length;
 
@@ -2316,7 +2316,7 @@ public class RecordManager
 
         RevisionName revisionName = new RevisionName( rootPage.getRevision(), btree.getName() );
 
-        revisionBTree.insert( revisionName, rootPage.getOffset(), 0 );
+        ((AbstractBTree<RevisionName, Long>)revisionBTree).insert( revisionName, ((AbstractPage<K, V>)rootPage).getOffset(), 0 );
 
         if ( LOG_CHECK.isDebugEnabled() )
         {
@@ -2401,7 +2401,7 @@ public class RecordManager
             for ( Page<K, V> page : pages )
             {
                 // Retrieve all the PageIO associated with this logical page
-                long firstOffset = page.getOffset();
+                long firstOffset = ((AbstractPage<K, V>)page).getOffset();
 
                 // skip the page with offset 0, this is the first in-memory root page that
                 // was copied during first insert in a BTree.
@@ -2411,7 +2411,7 @@ public class RecordManager
                     continue;
                 }
 
-                long lastOffset = page.getLastOffset();
+                long lastOffset = ((AbstractPage<K, V>)page).getLastOffset();
 
                 // Update the pointers
                 if ( firstFreePage == NO_PAGE )
@@ -2424,11 +2424,11 @@ public class RecordManager
                 {
                     // We add the Page's PageIOs before the 
                     // existing free pages.
-                    long offset = page.getLastOffset();
+                    long offset = ((AbstractPage<K, V>)page).getLastOffset();
 
                     if ( offset == NO_PAGE )
                     {
-                        offset = page.getOffset();
+                        offset = ((AbstractPage<K, V>)page).getOffset();
                     }
 
                     // Fetch the pageIO
@@ -2485,9 +2485,9 @@ public class RecordManager
                 offsetArray = new long[1];
             }
 
-            offsetArray[offsetArray.length - 1] = freePage.getOffset();
+            offsetArray[offsetArray.length - 1] = ((AbstractPage<K, V>)freePage).getOffset();
 
-            copiedPageBTree.insert( revision, offsetArray, 0 );
+            ((AbstractBTree<RevisionName, long[]>)copiedPageBTree).insert( revision, offsetArray, 0 );
         }
         catch ( Exception e )
         {

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java Tue Dec 17 07:04:52 2013
@@ -36,12 +36,12 @@ import java.util.List;
     /**
      * @return the copiedPage
      */
-    /* No qualifier */List<P> getCopiedPages();
+    List<P> getCopiedPages();
 
 
     /**
      * Add a new copied page
      * @param copiedPage the added page
      */
-    /* No qualifier */void addCopiedPage( P copiedPage );
+    void addCopiedPage( P copiedPage );
 }

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueHolder.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueHolder.java Tue Dec 17 07:04:52 2013
@@ -25,7 +25,7 @@ package org.apache.directory.mavibot.btr
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <V> The value type
  */
-public interface ValueHolder<V> extends Cloneable
+/* no qualifier */interface ValueHolder<V> extends Cloneable
 {
     /**
      * Tells if a value is contained in this ValueHolder

Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java?rev=1551470&r1=1551469&r2=1551470&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java Tue Dec 17 07:04:52 2013
@@ -36,6 +36,7 @@ import java.util.Random;
 import java.util.Set;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.AbstractBTree;
 import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.InMemoryValueHolder;
 import org.apache.directory.mavibot.btree.KeyHolder;
@@ -1172,7 +1173,7 @@ public class InMemoryBTreeTest
             addPage( btree, root, node, i );
         }
 
-        btree.setRootPage( root );
+        ((AbstractBTree<Integer, String>)btree).setRootPage( root );
 
         return btree;
     }



Mime
View raw message