directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r578129 - in /directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm: JdbmIndex.java JdbmTable.java
Date Fri, 21 Sep 2007 14:10:47 GMT
Author: elecharny
Date: Fri Sep 21 07:10:46 2007
New Revision: 578129

URL: http://svn.apache.org/viewvc?rev=578129&view=rev
Log:
Using generics to remove some warnings

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

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=578129&r1=578128&r2=578129&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
Fri Sep 21 07:10:46 2007
@@ -38,6 +38,7 @@
 import org.apache.directory.server.core.partition.impl.btree.IndexComparator;
 import org.apache.directory.server.core.partition.impl.btree.IndexConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.IndexEnumeration;
+import org.apache.directory.server.core.partition.impl.btree.Tuple;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -342,7 +343,7 @@
      */
     public IndexEnumeration listReverseIndices( Object id ) throws NamingException
     {
-        return new IndexEnumeration( reverse.listTuples( id ), true );
+        return new IndexEnumeration<Tuple>( reverse.listTuples( id ), true );
     }
 
 
@@ -351,7 +352,7 @@
      */
     public IndexEnumeration listIndices() throws NamingException
     {
-        return new IndexEnumeration( forward.listTuples() );
+        return new IndexEnumeration<Tuple>( forward.listTuples() );
     }
 
 
@@ -360,7 +361,7 @@
      */
     public IndexEnumeration listIndices( Object attrVal ) throws NamingException
     {
-        return new IndexEnumeration( forward.listTuples( getNormalized( attrVal ) ) );
+        return new IndexEnumeration<Tuple>( forward.listTuples( getNormalized( attrVal
) ) );
     }
 
 
@@ -368,18 +369,18 @@
      * @see org.apache.directory.server.core.partition.impl.btree.Index#listIndices(java.lang.Object,
      * boolean)
      */
-    public IndexEnumeration listIndices( Object attrVal, boolean isGreaterThan ) throws NamingException
+    public IndexEnumeration<Tuple> listIndices( Object attrVal, boolean isGreaterThan
) throws NamingException
     {
-        return new IndexEnumeration( forward.listTuples( getNormalized( attrVal ), isGreaterThan
) );
+        return new IndexEnumeration<Tuple>( forward.listTuples( getNormalized( attrVal
), isGreaterThan ) );
     }
 
 
     /**
      * @see Index#listIndices(org.apache.regexp.RE)
      */
-    public IndexEnumeration listIndices( Pattern regex ) throws NamingException
+    public IndexEnumeration<Tuple> listIndices( Pattern regex ) throws NamingException
     {
-        return new IndexEnumeration( forward.listTuples(), false, regex );
+        return new IndexEnumeration<Tuple>( forward.listTuples(), false, regex );
     }
 
 
@@ -387,9 +388,9 @@
      * @see Index#listIndices(org.apache.regexp.RE,
      * java.lang.String)
      */
-    public IndexEnumeration listIndices( Pattern regex, String prefix ) throws NamingException
+    public IndexEnumeration<Tuple> listIndices( Pattern regex, String prefix ) throws
NamingException
     {
-        return new IndexEnumeration( forward.listTuples( getNormalized( prefix ), true ),
false, regex );
+        return new IndexEnumeration<Tuple>( forward.listTuples( getNormalized( prefix
), true ), false, regex );
     }
 
 
@@ -423,7 +424,7 @@
      */
     public boolean hasValue( Pattern regex, Object id ) throws NamingException
     {
-        IndexEnumeration list = new IndexEnumeration( reverse.listTuples( id ), true, regex
);
+        IndexEnumeration<Tuple> list = new IndexEnumeration<Tuple>( reverse.listTuples(
id ), true, regex );
         boolean hasValue = list.hasMore();
         list.close();
         return hasValue;

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=578129&r1=578128&r2=578129&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
Fri Sep 21 07:10:46 2007
@@ -1045,9 +1045,9 @@
     /**
      * @see org.apache.directory.server.core.partition.impl.btree.Table#listTuples()
      */
-    public NamingEnumeration listTuples() throws NamingException
+    public NamingEnumeration<Tuple> listTuples() throws NamingException
     {
-        NamingEnumeration list = null;
+        NamingEnumeration<Tuple> list = null;
 
         try
         {
@@ -1074,7 +1074,7 @@
      * @see org.apache.directory.server.core.partition.impl.btree.Table#listTuples(java.lang.Object)
      */
     @SuppressWarnings("unchecked")
-    public NamingEnumeration listTuples( Object key ) throws NamingException
+    public NamingEnumeration<Tuple> listTuples( Object key ) throws NamingException
     {
         // Handle single and zero value returns without duplicates enabled
         if ( !allowsDuplicates )
@@ -1120,9 +1120,9 @@
      * @see Table#listTuples(java.lang.Object,
      * boolean)
      */
-    public NamingEnumeration listTuples( Object key, boolean isGreaterThan ) throws NamingException
+    public NamingEnumeration<Tuple> listTuples( Object key, boolean isGreaterThan )
throws NamingException
     {
-        NamingEnumeration list = null;
+        NamingEnumeration<Tuple> list = null;
 
         try
         {



Mime
View raw message