directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r615135 - in /directory/apacheds/branches/bigbang: core/src/main/java/org/apache/directory/server/core/authz/support/ core/src/main/java/org/apache/directory/server/core/event/ core/src/main/java/org/apache/directory/server/core/jndi/ core/...
Date Fri, 25 Jan 2008 07:30:54 GMT
Author: elecharny
Date: Thu Jan 24 23:30:49 2008
New Revision: 615135

URL: http://svn.apache.org/viewvc?rev=615135&view=rev
Log:
Removed some warnings by removing useless imports and using generics

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/apacheds/branches/bigbang/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
Thu Jan 24 23:30:49 2008
@@ -264,7 +264,6 @@
                     String svItem = j.next();
                     if ( oid.equals( oidRegistry.getOid( svItem ) ) )
                     {
-                        AttributeType attrType = attrRegistry.lookup( oid );
                         ServerAttribute attr = entry.get( oid );
                         
                         if ( ( attr != null ) && 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Thu Jan 24 23:30:49 2008
@@ -247,7 +247,6 @@
         Comparator comparator = getComparator( node.getAttribute() );
 
         // get the attribute associated with the node
-        AttributeType type = attributeTypeRegistry.lookup( node.getAttribute() );
         ServerAttribute attr = entry.get( node.getAttribute() );
 
         // If we do not have the attribute just return false

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
Thu Jan 24 23:30:49 2008
@@ -182,7 +182,7 @@
         entry.put( JSERIALDATA_ATTR, serialize( obj ) );
 
         // Add all the class names this object can be cast to:
-        Class[] classes = obj.getClass().getClasses();
+        Class<?>[] classes = obj.getClass().getClasses();
         Attribute javaClassNames = new AttributeImpl( JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Thu Jan 24 23:30:49 2008
@@ -427,9 +427,9 @@
         }
         else
         {
-            for ( Iterator ii = rdn.iterator(); ii.hasNext(); /**/ )
+            for ( Iterator<AttributeTypeAndValue> ii = rdn.iterator(); ii.hasNext();
/**/ )
             {
-                AttributeTypeAndValue atav = ( AttributeTypeAndValue ) ii.next();
+                AttributeTypeAndValue atav = ii.next();
 
                 // Add the Rdn attribute
                 boolean doRdnPut = attributes.get( atav.getNormType() ) == null;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java
Thu Jan 24 23:30:49 2008
@@ -69,5 +69,5 @@
      *
      * @return the Class associated with this factory.
      */
-    Class getAssociatedClass();
+    Class<?> getAssociatedClass();
 }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java
Thu Jan 24 23:30:49 2008
@@ -63,5 +63,5 @@
      *
      * @return the class associated with this factory.
      */
-    Class getAssociatedClass();
+    Class<?> getAssociatedClass();
 }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Thu Jan 24 23:30:49 2008
@@ -317,7 +317,7 @@
     {
         SearchControls searchCtls = opContext.getSearchControls();
         String[] attrIds = searchCtls.getReturningAttributes();
-        NamingEnumeration underlying;
+        NamingEnumeration<IndexRecord> underlying;
 
         underlying = searchEngine.search( 
             opContext.getDn(),
@@ -591,10 +591,10 @@
     public abstract String getProperty( String key ) throws NamingException;
 
 
-    public abstract Iterator getUserIndices();
+    public abstract Iterator<String> getUserIndices();
 
 
-    public abstract Iterator getSystemIndices();
+    public abstract Iterator<String> getSystemIndices();
 
 
     public abstract Attributes getIndices( Long id ) throws NamingException;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
Thu Jan 24 23:30:49 2008
@@ -145,10 +145,11 @@
             }
 
             // add all operational attributes
-            NamingEnumeration list = rec.getAttributes().getIDs();
+            NamingEnumeration<String> list = rec.getAttributes().getIDs();
+            
             while ( list.hasMore() )
             {
-                String attrId = ( String ) list.next();
+                String attrId = list.next();
                 AttributeType attrType = registry.lookup( attrId );
                 if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
@@ -182,11 +183,13 @@
             }
 
             // add all user attributes
-            NamingEnumeration list = rec.getAttributes().getIDs();
+            NamingEnumeration<String> list = rec.getAttributes().getIDs();
+            
             while ( list.hasMore() )
             {
-                String attrId = ( String ) list.next();
+                String attrId = list.next();
                 AttributeType attrType = registry.lookup( attrId );
+                
                 if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
                     Attribute attr = ( Attribute ) rec.getAttributes().get( attrId ).clone();
@@ -213,11 +216,11 @@
                 if ( null == attr )
                 {
                     // May be it's because the attributeType is a inherited one?
-                    Iterator descendants = registry.descendants( attrIds[ii] );
+                    Iterator<AttributeType> descendants = registry.descendants( attrIds[ii]
);
                     
                     while ( descendants.hasNext() )
                     {
-                        AttributeType atype = (AttributeType)descendants.next();
+                        AttributeType atype = descendants.next();
                         
                         attr = AttributeUtils.getAttribute( attrs, atype );
                         

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
Thu Jan 24 23:30:49 2008
@@ -85,7 +85,7 @@
     }
 
 
-    public NamingEnumeration search( Name base, AliasDerefMode aliasDerefMode, ExprNode filter,
SearchControls searchCtls )
+    public NamingEnumeration<IndexRecord> search( Name base, AliasDerefMode aliasDerefMode,
ExprNode filter, SearchControls searchCtls )
         throws NamingException
     {
         Name effectiveBase;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
Thu Jan 24 23:30:49 2008
@@ -40,7 +40,8 @@
 public class DisjunctionEnumeration implements NamingEnumeration<IndexRecord>
 {
     /** The underlying child enumerations */
-    private final NamingEnumeration[] children;
+    private final NamingEnumeration<IndexRecord>[] children;
+    
     /** LUT used to avoid returning duplicates */
     private final Map<Object, Object> candidates = new HashMap<Object, Object>();
     /** Index of current cursor used */
@@ -65,7 +66,7 @@
      * @param children array of child NamingInstances
      * @throws NamingException if something goes wrong
      */
-    public DisjunctionEnumeration( NamingEnumeration[] children ) throws NamingException
+    public DisjunctionEnumeration( NamingEnumeration<IndexRecord>[] children ) throws
NamingException
     {
         this.children = children;
 
@@ -91,7 +92,7 @@
         }
 
         // Grab the next candidate and add it's id to the LUT/hash of candidates
-        IndexRecord rec = ( IndexRecord ) children[index].next();
+        IndexRecord rec = children[index].next();
         prefetched.copy( rec );
         candidates.put( rec.getEntryId(), rec.getEntryId() );
     }
@@ -163,7 +164,7 @@
             }
 
             // Grab next candidate!
-            IndexRecord rec = ( IndexRecord ) children[index].next();
+            IndexRecord rec = children[index].next();
             prefetched.copy( rec );
 
             // Break through do/while if the candidate is seen for the first

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
Thu Jan 24 23:30:49 2008
@@ -42,5 +42,5 @@
      * @return an enumeration over the 
      * @throws NamingException if database access fails
      */
-    NamingEnumeration enumerate( ExprNode node ) throws NamingException;
+    NamingEnumeration<IndexRecord> enumerate( ExprNode node ) throws NamingException;
 }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
Thu Jan 24 23:30:49 2008
@@ -173,7 +173,7 @@
     private NamingEnumeration<IndexRecord> enumDisj( OrNode node ) throws NamingException
     {
         List<ExprNode> children = node.getChildren();
-        NamingEnumeration[] childEnumerations = new NamingEnumeration[children.size()];
+        NamingEnumeration<IndexRecord>[] childEnumerations = new NamingEnumeration[children.size()];
 
         // Recursively create NamingEnumerations for each child expression node
         for ( int ii = 0; ii < childEnumerations.length; ii++ )

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
Thu Jan 24 23:30:49 2008
@@ -84,7 +84,7 @@
      * @return enumeration over SearchResults
      * @throws NamingException if the search fails
      */
-    NamingEnumeration search( Name base, AliasDerefMode aliasDerefMode, ExprNode filter,
+    NamingEnumeration<IndexRecord> search( Name base, AliasDerefMode aliasDerefMode,
ExprNode filter,
                               SearchControls searchCtls ) throws NamingException;
 
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
Thu Jan 24 23:30:49 2008
@@ -84,7 +84,7 @@
     }
 
 
-    public Enumeration children()
+    public Enumeration<ASTNode> children()
     {
         return Collections.enumeration( children );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
Thu Jan 24 23:30:49 2008
@@ -73,12 +73,12 @@
         this.entry = entry;
         this.isMutable = isMutable;
 
-        NamingEnumeration list = entry.getIDs();
+        NamingEnumeration<String> list = entry.getIDs();
         int rowCount = 0;
 
         while ( list.hasMoreElements() )
         {
-            String attrId = ( String ) list.nextElement();
+            String attrId = list.nextElement();
             rowCount = rowCount + entry.get( attrId ).size();
         }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
Thu Jan 24 23:30:49 2008
@@ -80,11 +80,11 @@
         try
         {
             List<IndexRecord> records = new ArrayList<IndexRecord>();
-            NamingEnumeration childList = db.list( id );
+            NamingEnumeration<IndexRecord> childList = db.list( id );
             
             while ( childList.hasMore() )
             {
-                IndexRecord old = ( IndexRecord ) childList.next();
+                IndexRecord old = childList.next();
                 IndexRecord newRec = new IndexRecord();
                 newRec.copy( old );
                 records.add( newRec );
@@ -138,7 +138,7 @@
     }
 
 
-    public Enumeration children()
+    public Enumeration<TreeNode> children()
     {
         return Collections.enumeration( children );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
Thu Jan 24 23:30:49 2008
@@ -47,6 +47,8 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchResult;
+
 import java.io.File;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -382,13 +384,13 @@
     }
 
 
-    public final Iterator getUserIndices()
+    public final Iterator<String> getUserIndices()
     {
         return store.userIndices();
     }
 
 
-    public final Iterator getSystemIndices()
+    public final Iterator<String> getSystemIndices()
     {
         return store.systemIndices();
     }
@@ -555,12 +557,13 @@
     }
 
 
-    public final void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId
) throws NamingException
+    public final void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms,
String saslAuthId ) throws NamingException
     {
         if ( bindDn == null || credentials == null || mechanisms == null ||  saslAuthId ==
null )
         {
             // do nothing just using variables to prevent yellow lights : bad :)
         }
+        
         // does nothing
         throw new LdapAuthenticationNotSupportedException(
                 "Bind requests only tunnel down into partitions if there are no authenticators
to handle the mechanism.\n"

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
Thu Jan 24 23:30:49 2008
@@ -70,7 +70,6 @@
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.CascadeControl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -83,7 +82,6 @@
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.EmptyEnumeration;
 import org.apache.directory.shared.ldap.util.SingletonEnumeration;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -93,7 +91,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.NoPermissionException;
-import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InvalidAttributeValueException;
@@ -103,7 +100,6 @@
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -1415,9 +1411,9 @@
                     
                         for ( ServerValue<?> value:alteredObjectClass ) 
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get() ) )
+                            if ( !objectClass.contains( value ) )
                             {
-                                ocMods.add( alteredObjectClass.get() );
+                                ocMods.add( value );
                             }
                         }
                         
@@ -1426,9 +1422,9 @@
                     case ( DirContext.REMOVE_ATTRIBUTE  ):
                         for ( ServerValue<?> value:alteredObjectClass ) 
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get() ) )
+                            if ( !objectClass.contains( value ) )
                             {
-                                ocMods.remove( alteredObjectClass.get() );
+                                ocMods.remove( value );
                             }
                         }
                     
@@ -1437,9 +1433,9 @@
                     case ( DirContext.REPLACE_ATTRIBUTE  ):
                         for ( ServerValue<?> value:alteredObjectClass ) 
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get() ) )
+                            if ( !objectClass.contains( value ) )
                             {
-                                ocMods.add( alteredObjectClass.get() );
+                                ocMods.add( value );
                             }
                         }
                     

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
Thu Jan 24 23:30:49 2008
@@ -30,7 +30,6 @@
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
 
 
 /**

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=615135&r1=615134&r2=615135&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
Thu Jan 24 23:30:49 2008
@@ -28,7 +28,6 @@
 import org.apache.directory.shared.ldap.util.StringTools;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
 import java.util.Iterator;
 
 

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=615135&r1=615134&r2=615135&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
Thu Jan 24 23:30:49 2008
@@ -417,7 +417,7 @@
     public synchronized void add( Attribute attr, Object id ) throws NamingException
     {
         // Can efficiently batch add to the reverse table 
-        NamingEnumeration values = attr.getAll();
+        NamingEnumeration<?> values = attr.getAll();
         reverse.put( id, values );
 
         // Have no choice but to add each value individually to forward table
@@ -470,7 +470,7 @@
     public void drop( Attribute attr, Object id ) throws NamingException
     {
         // Can efficiently batch remove from the reverse table 
-        NamingEnumeration values = attr.getAll();
+        NamingEnumeration<?> values = attr.getAll();
 
         // If their are no values in attr this is a request to drop all
         if ( !values.hasMore() )



Mime
View raw message