You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/03/27 12:45:59 UTC
svn commit: r1582267 - in /directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot: KeyTupleArrayCursor.java KeyTupleValueCursor.java MavibotTable.java

Author: elecharny
Date: Thu Mar 27 11:45:59 2014
New Revision: 1582267

URL: http://svn.apache.org/r1582267
Log:
Renamed the KeyTupleArrayCursor to KeyTupleValueCursor to avoid a name collision with the xdbm project

Added:
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
      - copied, changed from r1580201, directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleArrayCursor.java
Removed:
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleArrayCursor.java
Modified:
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java

Copied: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java (from r1580201, directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleArrayCursor.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java?p2=directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java&p1=directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleArrayCursor.java&r1=1580201&r2=1582267&rev=1582267&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java Thu Mar 27 11:45:59 2014
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class KeyTupleArrayCursor<K, V> extends AbstractCursor<Tuple<K, V>>
+public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
 {
     /** A dedicated log for cursors */
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
@@ -61,7 +61,7 @@ public class KeyTupleArrayCursor<K, V> e
      * @param arrayTree the ArrayTree to build a Tuple returning Cursor over
      * @param key the constant key for which values are returned
      */
-    public KeyTupleArrayCursor( ValueCursor<V> cursor, K key )
+    public KeyTupleValueCursor( ValueCursor<V> cursor, K key )
     {
         this.key = key;
 

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java?rev=1582267&r1=1582266&r2=1582267&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java (original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotTable.java Thu Mar 27 11:45:59 2014
@@ -463,7 +463,7 @@ public class MavibotTable<K, V> extends 
             {
                 ValueCursor<V> dupHolder = bt.getValues( key );
 
-                return new KeyTupleArrayCursor<K, V>( dupHolder, key );
+                return new KeyTupleValueCursor<K, V>( dupHolder, key );
             }
         }
         catch ( KeyNotFoundException knfe )