svn commit: r940071 - in /directory/apacheds/trunk: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-base/src/main/java/org/apache/dire...

[se...@apache.org]

Author: seelmann
Date: Sat May  1 16:21:26 2010
New Revision: 940071

URL: http://svn.apache.org/viewvc?rev=940071&view=rev
Log:
Introduce type parameter for master table

Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java?rev=940071&r1=940070&r2=940071&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java Sat May  1 16:21:26 2010
@@ -34,7 +34,7 @@ import org.apache.directory.server.xdbm.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class AvlMasterTable<E> extends AvlTable<Long, E> implements MasterTable<E>
+public class AvlMasterTable<E> extends AvlTable<Long, E> implements MasterTable<Long, E>
 {
     private Properties props = new Properties();
     private AtomicLong counter = new AtomicLong( 0 );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=940071&r1=940070&r2=940071&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Sat May  1 16:21:26 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JdbmMasterTable<E> extends JdbmTable<Long,E> implements MasterTable<E>
+public class JdbmMasterTable<E> extends JdbmTable<Long,E> implements MasterTable<Long, E>
 {
     private static final StringComparator STRCOMP = new StringComparator();
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java?rev=940071&r1=940070&r2=940071&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java Sat May  1 16:21:26 2010
@@ -21,12 +21,12 @@ package org.apache.directory.server.xdbm
 
 
 /**
- * A master table used to store indexible entries.
+ * A master table used to store indexable entries.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MasterTable<E> extends Table<Long, E>
+public interface MasterTable<ID, E> extends Table<ID, E>
 {
     /** the base name for the db file for this table */
     String DBF = "master";
@@ -42,7 +42,7 @@ public interface MasterTable<E> extends 
      * @return the entry with operational attributes and all.
      * @throws Exception if there is a read error on the underlying Db.
      */
-    E get( Long id ) throws Exception;
+    E get( ID id ) throws Exception;
 
 
     /**
@@ -53,7 +53,7 @@ public interface MasterTable<E> extends 
      * @param id unique identifier of the entry to put
      * @throws Exception if there is a write error on the underlying Db.
      */
-    void put( Long id, E entry ) throws Exception;
+    void put( ID id, E entry ) throws Exception;
 
 
     /**
@@ -63,7 +63,7 @@ public interface MasterTable<E> extends 
      * @return the deleted entry
      * @throws Exception if there is a write error on the underlying Db
      */
-    void delete( Long id ) throws Exception;
+    void delete( ID id ) throws Exception;
 
 
     /**
@@ -72,7 +72,7 @@ public interface MasterTable<E> extends 
      *
      * @throws Exception if the admin table storing sequences cannot be read
      */
-    Long getCurrentId() throws Exception;
+    ID getCurrentId() throws Exception;
 
 
     /**
@@ -83,7 +83,7 @@ public interface MasterTable<E> extends 
      * by one
      * @throws Exception on failure to update the id sequence
      */
-    Long getNextId() throws Exception;
+    ID getNextId() throws Exception;
 
 
     /**