You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/12/11 04:52:07 UTC

svn commit: r603138 - in /directory/apacheds/branches/bigbang: btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-store/src/main/java/org/a...

Author: akarasulu
Date: Mon Dec 10 19:52:05 2007
New Revision: 603138

URL: http://svn.apache.org/viewvc?rev=603138&view=rev
Log:
correcting improperly added generics on interface

Modified:
    directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
    directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java

Modified: directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java (original)
+++ directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java Mon Dec 10 19:52:05 2007
@@ -244,13 +244,12 @@
      * key and enables single next steps across all duplicate records with
      * this key.  This enumeration will only iterate over duplicates of the key.
      * Unlike listTuples(Object) which returns Tuples from the enumerations 
-     * advances methods this call returns an enumeration with just the values
-     * of the key.
+     * this just returns the values of the key.
      * 
      * @param key the key to iterate over
      * @throws NamingException if the underlying browser could not be set
      */
-    NamingEnumeration<Tuple> listValues( Object key ) throws NamingException;
+    NamingEnumeration<Object> listValues( Object key ) throws NamingException;
 
 
     // ------------------------------------------------------------------------

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java Mon Dec 10 19:52:05 2007
@@ -238,7 +238,7 @@
         // test the listTuples() method
         // -------------------------------------------------------------------
 
-        NamingEnumeration tuples = table.listTuples();
+        NamingEnumeration<Tuple> tuples = table.listTuples();
         
         assertTrue( tuples.hasMore() ) ;
         tuple = ( Tuple ) tuples.next();
@@ -458,7 +458,7 @@
         // test the listValues(Object) method
         // -------------------------------------------------------------------
 
-        NamingEnumeration values = table.listValues( 0L );
+        NamingEnumeration<Object> values = table.listValues( 0L );
         assertFalse( values.hasMore() );
 
         values = table.listValues( 2L );
@@ -496,7 +496,7 @@
         // put(Object,Object) already tested in setUp() tests the 
         // this instead tests the NamingEnumeration overload
         
-        NamingEnumeration values = new ArrayNE( new Object[] {
+        NamingEnumeration<Object> values = new ArrayNE( new Object[] {
             3L,
             4L,
             5L,

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java Mon Dec 10 19:52:05 2007
@@ -460,7 +460,7 @@
         // test the listValues(Object) method
         // -------------------------------------------------------------------
 
-        NamingEnumeration values = table.listValues( 0L );
+        NamingEnumeration<Object> values = table.listValues( 0L );
         assertFalse( values.hasMore() );
 
         values = table.listValues( 2L );

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java Mon Dec 10 19:52:05 2007
@@ -353,7 +353,7 @@
         // test the listValues(Object) method
         // -------------------------------------------------------------------
 
-        NamingEnumeration values = table.listValues( 0L );
+        NamingEnumeration<Object> values = table.listValues( 0L );
         assertFalse( values.hasMore() );
 
         values = table.listValues( 2L );

Modified: directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Mon Dec 10 19:52:05 2007
@@ -453,7 +453,7 @@
      */
     public void drop( Object entryId ) throws NamingException
     {
-        NamingEnumeration values = reverse.listValues( entryId );
+        NamingEnumeration<Object> values = reverse.listValues( entryId );
 
         while ( values.hasMore() )
         {

Modified: directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=603138&r1=603137&r2=603138&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Mon Dec 10 19:52:05 2007
@@ -966,7 +966,7 @@
     /**
      * @see Table#listValues(java.lang.Object)
      */
-    public NamingEnumeration listValues( Object key ) throws NamingException
+    public NamingEnumeration<Object> listValues( Object key ) throws NamingException
     {
         if ( !allowsDuplicates )
         {