directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1138034 - /directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
Date Tue, 21 Jun 2011 14:56:13 GMT
Author: elecharny
Date: Tue Jun 21 14:56:13 2011
New Revision: 1138034

URL: http://svn.apache.org/viewvc?rev=1138034&view=rev
Log:
o Added some missing Javadoc
o Minor code refactoring, removal of dead code.

Modified:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=1138034&r1=1138033&r2=1138034&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
Tue Jun 21 14:56:13 2011
@@ -43,9 +43,9 @@ public class KeyTupleBTreeCursor<K,V> ex
     private final BTree btree;
     private final K key;
 
-    private jdbm.helper.Tuple valueTuple = new jdbm.helper.Tuple();
+    private jdbm.helper.Tuple<K,V> valueTuple = new jdbm.helper.Tuple<K,V>();
     private Tuple<K,V> returnedTuple = new Tuple<K,V>();
-    private TupleBrowser browser;
+    private TupleBrowser<K,V> browser;
     private boolean valueAvailable;
 
 
@@ -74,6 +74,9 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean available()
     {
         return valueAvailable;
@@ -86,12 +89,18 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void afterKey( K key ) throws Exception
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void beforeValue( K key, V value ) throws Exception
     {
         checkNotClosed( "beforeValue()" );
@@ -105,6 +114,9 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     @SuppressWarnings("unchecked")
     public void afterValue( K key, V value ) throws Exception
     {
@@ -130,11 +142,7 @@ public class KeyTupleBTreeCursor<K,V> ex
 
             int nextCompared = comparator.compare( next, value );
 
-            if ( nextCompared <= 0 )
-            {
-                // just continue
-            }
-            else if ( nextCompared > 0 )
+            if ( nextCompared > 0 )
             {
                 /*
                  * If we just have values greater than the element argument
@@ -142,15 +150,13 @@ public class KeyTupleBTreeCursor<K,V> ex
                  * the call below to getPrevious() will fail.  In this special
                  * case we just reset the Cursor's browser and return.
                  */
-                if ( browser.getPrevious( valueTuple ) )
-                {
-                }
-                else
+                if ( !browser.getPrevious( valueTuple ) )
                 {
                     browser = btree.browse( this.key );
                 }
 
                 clearValue();
+                
                 return;
             }
         }
@@ -175,12 +181,18 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void after( Tuple<K,V> element ) throws Exception
     {
         afterValue( key, element.getValue() );
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void beforeFirst() throws Exception
     {
         checkNotClosed( "beforeFirst()" );
@@ -189,6 +201,9 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void afterLast() throws Exception
     {
         checkNotClosed( "afterLast()" );
@@ -196,48 +211,66 @@ public class KeyTupleBTreeCursor<K,V> ex
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean first() throws Exception
     {
         beforeFirst();
+        
         return next();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public boolean last() throws Exception
     {
         afterLast();
+        
         return previous();
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     @SuppressWarnings("unchecked")
     public boolean previous() throws Exception
     {
         checkNotClosed( "previous()" );
+        
         if ( browser.getPrevious( valueTuple ) )
         {
             // work around to fix direction change problem with jdbm browser
-            if ( returnedTuple.getValue() != null &&
-                comparator.compare( ( V ) valueTuple.getKey(), returnedTuple.getValue() )
== 0 )
+            if ( ( returnedTuple.getValue() != null ) &&
+                ( comparator.compare( ( V ) valueTuple.getKey(), returnedTuple.getValue()
) == 0 ) )
             {
                 browser.getPrevious( valueTuple ) ;
             }
             returnedTuple.setKey( key );
             returnedTuple.setValue( ( V ) valueTuple.getKey() );
+            
             return valueAvailable = true;
         }
         else
         {
             clearValue();
+            
             return false;
         }
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     @SuppressWarnings("unchecked")
     public boolean next() throws Exception
     {
         checkNotClosed( "next()" );
+        
         if ( browser.getNext( valueTuple ) )
         {
             // work around to fix direction change problem with jdbm browser
@@ -246,21 +279,28 @@ public class KeyTupleBTreeCursor<K,V> ex
             {
                 browser.getNext( valueTuple ) ;
             }
+            
             returnedTuple.setKey( key );
             returnedTuple.setValue( ( V ) valueTuple.getKey() );
+            
             return valueAvailable = true;
         }
         else
         {
             clearValue();
+            
             return false;
         }
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public Tuple<K,V> get() throws Exception
     {
         checkNotClosed( "get()" );
+        
         if ( valueAvailable )
         {
             return returnedTuple;



Mime
View raw message