directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r575496 - in /directory: apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/ apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/...
Date Thu, 13 Sep 2007 23:27:40 GMT
Author: elecharny
Date: Thu Sep 13 16:27:38 2007
New Revision: 575496

URL: http://svn.apache.org/viewvc?rev=575496&view=rev
Log:
Some more warning removals (generics)

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java Thu Sep 13 16:27:38 2007
@@ -61,7 +61,7 @@
     /**
      * Returns the initial context environment of the {@link DirectoryService}.
      */
-    Hashtable<String,Object> getEnvironment();
+    Hashtable<String, Object> getEnvironment();
 
 
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Thu Sep 13 16:27:38 2007
@@ -22,7 +22,6 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -75,7 +74,7 @@
     private final PartitionNexus nexus;
     
     /** the env to use for searching */
-    private final Hashtable<?,?> env;
+    private final Map<?, ?> env;
 
     /** Stores a reference to the AttributeType registry */ 
     private AttributeTypeRegistry attributeTypeRegistry;
@@ -105,7 +104,7 @@
     {
     	normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
         nexus = factoryCfg.getPartitionNexus();
-        env = ( Hashtable<?,?> ) factoryCfg.getEnvironment().clone();
+        env = ( Map<?, ?> ) factoryCfg.getEnvironment().clone();
         attributeTypeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
         
         memberAT = attributeTypeRegistry.lookup( SchemaConstants.MEMBER_AT_OID ); 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Thu Sep 13 16:27:38 2007
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +75,7 @@
     private static final Logger log = LoggerFactory.getLogger( TupleCache.class );
 
     /** cloned startup environment properties we use for subentry searching */
-    private final Hashtable<?,?> env;
+    private final Map<?, ?> env;
     
     /** a map of strings to ACITuple collections */
     private final Map<String,List<ACITuple>> tuples = new HashMap<String,List<ACITuple>>();
@@ -111,7 +110,7 @@
         OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeTypeRegistry, oidRegistry );
         aciParser = new ACIItemParser( ncn, normalizerMap );
-        env = ( Hashtable<?,?> ) factoryCfg.getEnvironment().clone();
+        env = ( Map<?, ?> ) factoryCfg.getEnvironment().clone();
         prescriptiveAciAT = attributeTypeRegistry.lookup( SchemaConstants.PRESCRIPTIVE_ACI_AT ); 
         initialize();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventService.java Thu Sep 13 16:27:38 2007
@@ -194,7 +194,7 @@
         }
         else if ( obj instanceof List )
         {
-            List<Object> list = ( List ) obj;
+            List<Object> list = (List<Object>)obj;
             list.add( rec );
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Thu Sep 13 16:27:38 2007
@@ -36,7 +36,7 @@
 public class SearchOperationContext extends AbstractOperationContext
 {
     /** The search environment type */
-    private Map env;
+    private Map<?, ?> env;
     
     /** The filter */
     private ExprNode filter;
@@ -59,7 +59,7 @@
      * Creates a new instance of SearchOperationContext.
      *
      */
-    public SearchOperationContext( LdapDN dn, Map env, ExprNode filter, SearchControls searchControls )
+    public SearchOperationContext( LdapDN dn, Map<?, ?> env, ExprNode filter, SearchControls searchControls )
     {
         super( dn );
         this.env = env;
@@ -67,12 +67,12 @@
         this.searchControls = searchControls;
     }
 
-    public Map getEnv()
+    public Map<?, ?> getEnv()
     {
         return env;
     }
 
-    public void setEnv( Map env )
+    public void setEnv( Map<String, Object> env )
     {
         this.env = env;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Thu Sep 13 16:27:38 2007
@@ -87,10 +87,12 @@
     }
 
 
+    @SuppressWarnings(value={"unchecked"})
     public final synchronized Context getInitialContext( Hashtable env ) throws NamingException
     {
         //TM long t0 = System.nanoTime();
         Configuration cfg = Configuration.toConfiguration( env );
+        
         env = ( Hashtable<String, Object> ) env.clone();
         
         LdapDN principalDn = null;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Sep 13 16:27:38 2007
@@ -41,6 +41,7 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 import javax.naming.event.EventContext;
 import javax.naming.event.NamingListener;
 import javax.naming.ldap.Control;
@@ -109,7 +110,7 @@
     private final LdapDN dn;
 
     /** The set of registered NamingListeners */
-    private final Set listeners = new HashSet();
+    private final Set<NamingListener> listeners = new HashSet<NamingListener>();
 
     /** The Principal associated with this context */
     private LdapPrincipal principal;
@@ -142,6 +143,7 @@
      * @throws NamingException if the environment parameters are not set 
      * correctly.
      */
+    @SuppressWarnings(value={"unchecked"})
     protected ServerContext(DirectoryService service, Hashtable<String, Object> env) throws NamingException
     {
         this.service = service;
@@ -174,12 +176,13 @@
      * @param principal the directory user principal that is propagated
      * @param dn the distinguished name of this context
      */
+    @SuppressWarnings(value={"unchecked"})
     protected ServerContext(DirectoryService service, LdapPrincipal principal, Name dn) throws NamingException
     {
         this.service = service;
         this.dn = ( LdapDN ) dn.clone();
 
-        this.env = ( Hashtable ) service.getConfiguration().getEnvironment().clone();
+        this.env = ( Hashtable<String, Object> ) service.getConfiguration().getEnvironment().clone();
         this.env.put( PROVIDER_URL, dn.toString() );
         this.nexusProxy = new PartitionNexusProxy( this, service );
 
@@ -237,7 +240,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after list operations.
      */
-    protected NamingEnumeration doSearchOperation( LdapDN dn, Map env, ExprNode filter, SearchControls searchControls ) 
+    protected NamingEnumeration<SearchResult> doSearchOperation( LdapDN dn, Map env, ExprNode filter, SearchControls searchControls ) 
         throws NamingException
     {
         // setup the op context and populate with request controls
@@ -245,7 +248,7 @@
         opCtx.addRequestControls( requestControls );
         
         // execute search operation
-        NamingEnumeration results = nexusProxy.search( opCtx );
+        NamingEnumeration<SearchResult> results = nexusProxy.search( opCtx );
 
         // clear the request controls and set the response controls 
         requestControls = EMPTY_CONTROLS;
@@ -982,6 +985,7 @@
     /**
      * @see javax.naming.Context#list(java.lang.String)
      */
+    @SuppressWarnings(value={"unchecked"})
     public NamingEnumeration list( String name ) throws NamingException
     {
         return list( new LdapDN( name ) );
@@ -991,6 +995,7 @@
     /**
      * @see javax.naming.Context#list(javax.naming.Name)
      */
+    @SuppressWarnings(value={"unchecked"})
     public NamingEnumeration list( Name name ) throws NamingException
     {
         return doListOperation( buildTarget( name ) );
@@ -1000,6 +1005,7 @@
     /**
      * @see javax.naming.Context#listBindings(java.lang.String)
      */
+    @SuppressWarnings(value={"unchecked"})
     public NamingEnumeration listBindings( String name ) throws NamingException
     {
         return listBindings( new LdapDN( name ) );
@@ -1009,6 +1015,7 @@
     /**
      * @see javax.naming.Context#listBindings(javax.naming.Name)
      */
+    @SuppressWarnings(value={"unchecked"})
     public NamingEnumeration listBindings( Name name ) throws NamingException
     {
         // Conduct a special one level search at base for all objects
@@ -1120,7 +1127,7 @@
      *
      * @return the set of listeners used for tracking registered name listeners.
      */
-    protected Set getListeners()
+    protected Set<NamingListener> getListeners()
     {
         return listeners;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Thu Sep 13 16:27:38 2007
@@ -58,7 +58,7 @@
      * @param env the JNDI environment parameters
      * @throws NamingException the context cannot be created
      */
-    public ServerLdapContext( DirectoryService service, Hashtable env ) throws NamingException
+    public ServerLdapContext( DirectoryService service, Hashtable<String, Object> env ) throws NamingException
     {
         super( service, env );
         refService = (( ReferralService )service.getConfiguration()

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java Thu Sep 13 16:27:38 2007
@@ -37,12 +37,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DisjunctionEnumeration implements NamingEnumeration
+public class DisjunctionEnumeration implements NamingEnumeration<IndexRecord>
 {
     /** The underlying child enumerations */
     private final NamingEnumeration[] children;
     /** LUT used to avoid returning duplicates */
-    private final Map candidates = new HashMap();
+    private final Map<Object, Object> candidates = new HashMap<Object, Object>();
     /** Index of current cursor used */
     private int index = 0;
     /** Candidate to return */
@@ -65,7 +65,7 @@
      * @param children array of child NamingInstances
      * @throws NamingException if something goes wrong
      */
-    public DisjunctionEnumeration(NamingEnumeration[] children) throws NamingException
+    public DisjunctionEnumeration( NamingEnumeration[] children ) throws NamingException
     {
         this.children = children;
 
@@ -104,7 +104,7 @@
     /**
      * @see java.util.Enumeration#nextElement()
      */
-    public Object nextElement()
+    public IndexRecord nextElement()
     {
         try
         {
@@ -139,7 +139,7 @@
      * @return a candidate element
      * @throws NamingException if an error occurs
      */
-    public Object next() throws NamingException
+    public IndexRecord next() throws NamingException
     {
         // Store the last prefetched candidate to return in candidate
         candidate.copy( prefetched );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java Thu Sep 13 16:27:38 2007
@@ -80,9 +80,9 @@
      * @return an enumeration over the 
      * @throws NamingException if database access fails
      */
-    public NamingEnumeration enumerate( ExprNode node ) throws NamingException
+    public NamingEnumeration<IndexRecord> enumerate( ExprNode node ) throws NamingException
     {
-        NamingEnumeration list = null;
+    	NamingEnumeration<IndexRecord> list = null;
 
         if ( node instanceof ScopeNode )
         {
@@ -162,7 +162,7 @@
      *
      * @param node the disjunction expression branch node
      */
-    private NamingEnumeration enumDisj( BranchNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumDisj( BranchNode node ) throws NamingException
     {
         List<ExprNode> children = node.getChildren();
         NamingEnumeration[] childEnumerations = new NamingEnumeration[children.size()];
@@ -182,10 +182,10 @@
      *
      * @param node a negation expression branch node
      */
-    private NamingEnumeration enumNeg( final BranchNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumNeg( final BranchNode node ) throws NamingException
     {
-        NamingEnumeration baseEnumeration = null;
-        NamingEnumeration enumeration = null;
+    	NamingEnumeration<IndexRecord> baseEnumeration = null;
+    	NamingEnumeration<IndexRecord> enumeration = null;
         
         baseEnumeration = db.getNdnIndex().listIndices();
 
@@ -210,7 +210,7 @@
      *
      * @param node a conjunction expression branch node
      */
-    private NamingEnumeration enumConj( final BranchNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumConj( final BranchNode node ) throws NamingException
     {
         int minIndex = 0;
         long minValue = Long.MAX_VALUE;
@@ -223,6 +223,7 @@
          * expression.
          */
         final List<ExprNode> children = node.getChildren();
+        
         for ( int ii = 0; ii < children.size(); ii++ )
         {
             ExprNode child = children.get( ii );
@@ -261,7 +262,7 @@
         };
 
         // Do recursive call to build child enumeration then wrap and return
-        NamingEnumeration underlying = enumerate( minChild );
+        NamingEnumeration<IndexRecord> underlying = enumerate( minChild );
         IndexAssertionEnumeration iae;
         iae = new IndexAssertionEnumeration( underlying, assertion );
         return iae;
@@ -276,7 +277,7 @@
      * @return an enumeration over the index records matching the AVA
      * @throws NamingException if there is a failure while accessing the db
      */
-    private NamingEnumeration enumPresence( final PresenceNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumPresence( final PresenceNode node ) throws NamingException
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
@@ -297,7 +298,7 @@
      * @return an enumeration over the index records matching the AVA
      * @throws NamingException if there is a failure while accessing the db
      */
-    private NamingEnumeration enumGreater( final SimpleNode node, final boolean isGreater ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumGreater( final SimpleNode node, final boolean isGreater ) throws NamingException
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
@@ -325,7 +326,7 @@
      * @return an enumeration over the index records matching the AVA
      * @throws NamingException if there is a failure while accessing the db
      */
-    private NamingEnumeration enumEquality( final SimpleNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumEquality( final SimpleNode node ) throws NamingException
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
@@ -345,9 +346,10 @@
      * @return the enumeration over all perspective candidates satisfying expr
      * @throws NamingException if db access failures result
      */
-    private NamingEnumeration nonIndexedScan( final LeafNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> nonIndexedScan( final LeafNode node ) throws NamingException
     {
-        NamingEnumeration underlying = db.getNdnIndex().listIndices();
+    	NamingEnumeration<IndexRecord> underlying = db.getNdnIndex().listIndices();
+    	
         IndexAssertion assertion = new IndexAssertion()
         {
             public boolean assertCandidate( IndexRecord record ) throws NamingException

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java Thu Sep 13 16:27:38 2007
@@ -59,7 +59,7 @@
      * @throws NamingException if any system indices fail
      * @see org.apache.directory.server.core.partition.impl.btree.Enumerator#enumerate(ExprNode)
      */
-    public NamingEnumeration enumerate( ExprNode node ) throws NamingException
+    public NamingEnumeration<IndexRecord> enumerate( ExprNode node ) throws NamingException
     {
         final ScopeNode snode = ( ScopeNode ) node;
         final Long id = db.getEntryId( snode.getBaseDn() );
@@ -70,11 +70,14 @@
                 final IndexRecord record = new IndexRecord();
                 record.setEntryId( id );
                 record.setIndexKey( snode.getBaseDn() );
-                return new SingletonEnumeration( record );
+                return new SingletonEnumeration<IndexRecord>( record );
+                
             case ( SearchControls.ONELEVEL_SCOPE  ):
                 return enumerateChildren( snode.getBaseDn(), snode.getDerefAliases().isDerefInSearching() );
+            
             case ( SearchControls.SUBTREE_SCOPE  ):
                 return enumerateDescendants( snode );
+            
             default:
                 throw new NamingException( "Unrecognized search scope!" );
         }
@@ -92,11 +95,11 @@
      * @throws NamingException if any failures occur while accessing system
      * indices.
      */
-    private NamingEnumeration enumerateChildren( String dn, boolean deref ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumerateChildren( String dn, boolean deref ) throws NamingException
     {
         Index idx = db.getHierarchyIndex();
         final Long id = db.getEntryId( dn );
-        final NamingEnumeration children = idx.listIndices( id );
+        final NamingEnumeration<IndexRecord> children = idx.listIndices( id );
 
         /*
          * If alias dereferencing is not enabled while searching then we just
@@ -142,7 +145,7 @@
      * @throws NamingException if any failures occur while accessing system
      * indices.
      */
-    private NamingEnumeration enumerateDescendants( final ScopeNode node ) throws NamingException
+    private NamingEnumeration<IndexRecord> enumerateDescendants( final ScopeNode node ) throws NamingException
     {
         Index idx = null;
 
@@ -154,7 +157,7 @@
         {
             // Gets a NamingEnumeration over all elements
             idx = db.getNdnIndex();
-            NamingEnumeration underlying = idx.listIndices();
+            NamingEnumeration<IndexRecord> underlying = idx.listIndices();
             return new IndexAssertionEnumeration( underlying, new AssertDescendant( node ) );
         }
 
@@ -169,7 +172,7 @@
 
         // Gets a NamingEnumeration over all elements
         idx = db.getNdnIndex();
-        NamingEnumeration underlying = idx.listIndices();
+        NamingEnumeration<IndexRecord> underlying = idx.listIndices();
         return new IndexAssertionEnumeration( underlying, assertion );
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java Thu Sep 13 16:27:38 2007
@@ -73,7 +73,7 @@
      * @see Enumerator#enumerate(
      * org.apache.directory.shared.ldap.filter.ExprNode)
      */
-    public NamingEnumeration enumerate( final ExprNode node ) throws NamingException
+    public NamingEnumeration<IndexRecord> enumerate( final ExprNode node ) throws NamingException
     {
         Pattern regex = null;
         Index idx = null;
@@ -123,7 +123,8 @@
          * underlying enumeration.  An evaluator in an assertion is used to 
          * constrain the result set.
          */
-        NamingEnumeration underlying = db.getNdnIndex().listIndices();
+        NamingEnumeration<IndexRecord> underlying = db.getNdnIndex().listIndices();
+        
         IndexAssertion assertion = new IndexAssertion()
         {
             public boolean assertCandidate( final IndexRecord record ) throws NamingException

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Thu Sep 13 16:27:38 2007
@@ -148,7 +148,7 @@
     /**
      * @see AbstractTableModel#getColumnClass(int)
      */
-    public Class getColumnClass( int c )
+    public Class<String> getColumnClass( int c )
     {
         return String.class;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Thu Sep 13 16:27:38 2007
@@ -23,8 +23,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -49,23 +50,23 @@
     private final BTreePartition partition;
     private final EntryNode parent;
     private final Attributes entry;
-    private final ArrayList children;
+    private final ArrayList<TreeNode> children;
     private final Long id;
 
 
-    public EntryNode(Long id, EntryNode parent, BTreePartition partition, Attributes entry, HashMap map)
+    public EntryNode(Long id, EntryNode parent, BTreePartition partition, Attributes entry, Map<Long, EntryNode> map)
     {
         this( id, parent, partition, entry, map, null, null );
     }
 
 
-    public EntryNode(Long id, EntryNode parent, BTreePartition db, Attributes entry, HashMap map,
-        ExprNode exprNode, SearchEngine engine)
+    public EntryNode( Long id, EntryNode parent, BTreePartition db, Attributes entry, Map<Long, EntryNode> map,
+        ExprNode exprNode, SearchEngine engine )
     {
         this.partition = db;
         this.id = id;
         this.entry = entry;
-        this.children = new ArrayList();
+        children = new ArrayList<TreeNode>();
 
         if ( parent == null )
         {
@@ -78,8 +79,9 @@
 
         try
         {
-            ArrayList records = new ArrayList();
+            List<IndexRecord> records = new ArrayList<IndexRecord>();
             NamingEnumeration childList = db.list( id );
+            
             while ( childList.hasMore() )
             {
                 IndexRecord old = ( IndexRecord ) childList.next();
@@ -87,6 +89,7 @@
                 newRec.copy( old );
                 records.add( newRec );
             }
+            
             childList.close();
 
             Iterator list = records.iterator();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Thu Sep 13 16:27:38 2007
@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Stack;
 
 import javax.naming.NamingEnumeration;
@@ -115,7 +116,7 @@
     // Non Swing Stuff
     private BTreePartition partition = null;
     private boolean doCleanUp = false;
-    private HashMap nodes = new HashMap();
+    private Map<Long, EntryNode> nodes = null;
     private EntryNode root = null;
     private SearchEngine eng = null;
 
@@ -646,7 +647,7 @@
             limitMax = Integer.parseInt( limit );
         }
 
-        Hashtable env = new Hashtable();
+        Hashtable<String, Object> env = new Hashtable<String, Object>();
 
         env.put( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, DerefAliasesEnum.DEREF_ALWAYS );
 
@@ -707,9 +708,9 @@
 
     public void selectTreeNode( Long id )
     {
-        Stack stack = new Stack();
+        Stack<TreeNode> stack = new Stack<TreeNode>();
         Object[] comps = null;
-        TreeNode parent = ( EntryNode ) nodes.get( id );
+        TreeNode parent = nodes.get( id );
 
         while ( parent != null && ( parent != parent.getParent() ) )
         {
@@ -868,7 +869,7 @@
     private void load() throws NamingException
     {
         // boolean doFiltered = false;
-        nodes = new HashMap();
+        nodes = new HashMap<Long, EntryNode>();
 
         Attributes suffix = partition.getSuffixEntry();
         Long id = partition.getEntryId( partition.getSuffix().toString() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Thu Sep 13 16:27:38 2007
@@ -36,6 +36,7 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
@@ -71,10 +72,10 @@
     private LdapContext ctx;
 
     /** the changes (ModificationItems) representing cached alterations to preferences */
-    private ArrayList changes = new ArrayList( 3 );
+    private ArrayList<ModificationItem> changes = new ArrayList<ModificationItem>( 3 );
 
     /** maps changes based on key: key->list of mods (on same key) */
-    private HashMap keyToChange = new HashMap( 3 );
+    private HashMap<String, List<ModificationItem>> keyToChange = new HashMap<String, List<ModificationItem>>( 3 );
 
 
     /**
@@ -89,7 +90,7 @@
         MutableStartupConfiguration cfg = new MutableStartupConfiguration();
         cfg.setAllowAnonymousAccess( true );
 
-        Hashtable env = new Hashtable( cfg.toJndiEnvironment() );
+        Hashtable<String, Object> env = new Hashtable<String, Object>( cfg.toJndiEnvironment() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, PreferencesUtils.SYSPREF_BASE );
 
@@ -111,7 +112,7 @@
             throw new ServerSystemPreferenceException( "Cannot close child preferences." );
         }
 
-        Hashtable env = new Hashtable( new ShutdownConfiguration().toJndiEnvironment() );
+        Hashtable<String, Object> env = new Hashtable<String, Object>( new ShutdownConfiguration().toJndiEnvironment() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, PreferencesUtils.SYSPREF_BASE );
 
@@ -284,12 +285,13 @@
 
     protected String[] childrenNamesSpi() throws BackingStoreException
     {
-        ArrayList children = new ArrayList();
+        List<String> children = new ArrayList<String>();
         NamingEnumeration list = null;
 
         try
         {
             list = ctx.list( "" );
+            
             while ( list.hasMore() )
             {
                 NameClassPair ncp = ( NameClassPair ) list.next();
@@ -309,19 +311,22 @@
     protected String[] keysSpi() throws BackingStoreException
     {
         Attributes attrs = null;
-        ArrayList keys = new ArrayList();
+        List<String> keys = new ArrayList<String>();
 
         try
         {
             attrs = ctx.getAttributes( "" );
             NamingEnumeration ids = attrs.getIDs();
+            
             while ( ids.hasMore() )
             {
                 String id = ( String ) ids.next();
+                
                 if ( id.equals( SchemaConstants.OBJECT_CLASS_AT ) || id.equals( "prefNodeName" ) )
                 {
                     continue;
                 }
+                
                 keys.add( id );
             }
         }
@@ -345,15 +350,16 @@
     private void addDelta( ModificationItemImpl mi )
     {
         String key = mi.getAttribute().getID();
-        List deltas = null;
+        List<ModificationItem> deltas = null;
         changes.add( mi );
+        
         if ( keyToChange.containsKey( key ) )
         {
-            deltas = ( List ) keyToChange.get( key );
+            deltas = ( List<ModificationItem> ) keyToChange.get( key );
         }
         else
         {
-            deltas = new ArrayList();
+            deltas = new ArrayList<ModificationItem>();
         }
 
         deltas.add( mi );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Thu Sep 13 16:27:38 2007
@@ -184,6 +184,7 @@
      * 
      * @throws NamingException
      */
+    @SuppressWarnings(value={"unchecked"})
     public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Thu Sep 13 16:27:38 2007
@@ -106,7 +106,7 @@
         return classBytes;
     }
     
-    public Class findClass( String name ) throws ClassNotFoundException
+    public Class<?> findClass( String name ) throws ClassNotFoundException
     {
         byte[] classBytes = null;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java Thu Sep 13 16:27:38 2007
@@ -35,24 +35,24 @@
  */
 public class SubentryCache
 {
-    private final Map name2subentry = new HashMap();
+    private final Map<String, Subentry> name2subentry = new HashMap<String, Subentry>();
     
     
     final Subentry getSubentry( String normalizedName )
     {
-        return ( Subentry ) name2subentry.get( normalizedName );
+        return name2subentry.get( normalizedName );
     }
     
     
     final Subentry removeSubentry( String normalizedName )
     {
-        return ( Subentry ) name2subentry.remove( normalizedName );
+        return  name2subentry.remove( normalizedName );
     }
     
     
     final Subentry setSubentry( String normalizedName, SubtreeSpecification ss, int types )
     {
-        Subentry old = ( Subentry ) name2subentry.get( normalizedName );
+        Subentry old = name2subentry.get( normalizedName );
         Subentry subentry = new Subentry();
         subentry.setSubtreeSpecification( ss );
         subentry.setTypes( types );
@@ -67,7 +67,7 @@
     }
     
     
-    final Iterator nameIterator()
+    final Iterator<String> nameIterator()
     {
         return name2subentry.keySet().iterator();
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Thu Sep 13 16:27:38 2007
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.naming.Name;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
@@ -34,7 +36,10 @@
 import org.apache.directory.server.core.authz.support.OperationScope;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.UserClass;
+import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 
 
 /**
@@ -45,8 +50,12 @@
  */
 public class MostSpecificUserClassFilterTest extends TestCase
 {
-    private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
-    private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
+    private static final Set<Name> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<Name>() );
+    private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
+    private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+    private static final Collection<SubtreeSpecification> EMPTY_SUBTREE_SPECIFICATION_COLLECTION = Collections.unmodifiableCollection( new ArrayList<SubtreeSpecification>() );
+    private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+    private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
 
     private static final List<ACITuple> TUPLES_A = new ArrayList<ACITuple>();
     private static final List<ACITuple> TUPLES_B = new ArrayList<ACITuple>();
@@ -56,25 +65,23 @@
 
     static
     {
-        Collection name = new ArrayList();
-        Collection thisEntry = new ArrayList();
-        Collection userGroup = new ArrayList();
-        Collection subtree = new ArrayList();
-        Collection allUsers = new ArrayList();
+        Collection<UserClass> name = new ArrayList<UserClass>();
+        Collection<UserClass> thisEntry = new ArrayList<UserClass>();
+        Collection<UserClass> userGroup = new ArrayList<UserClass>();
+        Collection<UserClass> subtree = new ArrayList<UserClass>();
+        Collection<UserClass> allUsers = new ArrayList<UserClass>();
 
-        name.add( new UserClass.Name( EMPTY_SET ) );
+        name.add( new UserClass.Name( EMPTY_NAME_SET ) );
         thisEntry.add( UserClass.THIS_ENTRY );
-        userGroup.add( new UserClass.UserGroup( EMPTY_SET ) );
-        subtree.add( new UserClass.Subtree( EMPTY_COLLECTION ) );
+        userGroup.add( new UserClass.UserGroup( EMPTY_NAME_SET ) );
+        subtree.add( new UserClass.Subtree( EMPTY_SUBTREE_SPECIFICATION_COLLECTION ) );
         allUsers.add( UserClass.ALL_USERS );
 
-        ACITuple nameTuple = new ACITuple( name, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 );
-        ACITuple thisEntryTuple = new ACITuple( thisEntry, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
-            0 );
-        ACITuple userGroupTuple = new ACITuple( userGroup, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
-            0 );
-        ACITuple subtreeTuple = new ACITuple( subtree, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 );
-        ACITuple allUsersTuple = new ACITuple( allUsers, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 );
+        ACITuple nameTuple = new ACITuple( name, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 );
+        ACITuple thisEntryTuple = new ACITuple( thisEntry, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 );
+        ACITuple userGroupTuple = new ACITuple( userGroup, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 );
+        ACITuple subtreeTuple = new ACITuple( subtree, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 );
+        ACITuple allUsersTuple = new ACITuple( allUsers, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 );
 
         TUPLES_A.add( nameTuple );
         TUPLES_A.add( thisEntryTuple );
@@ -103,11 +110,11 @@
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
 
-        Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+        Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
             null, null, null, null, null, null, null, null ).size() );
 
-        Collection tuples = new ArrayList();
-        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, false, 0 ) );
+        Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+        tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
 
         Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
             null, null, null, null, null, null ).size() );
@@ -171,8 +178,8 @@
     {
         MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
 
-        List tuples = new ArrayList( TUPLES_E );
-        tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+        List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_E );
+        tuples = (List<ACITuple>)filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
             null, null );
 
         Assert.assertEquals( 2, tuples.size() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java Thu Sep 13 16:27:38 2007
@@ -59,9 +59,8 @@
         
         attrs.put( attr0 );
         attrs.put( attr1 );
-        AttributesSerializerUtils serializer = new AttributesSerializerUtils();
-        byte[] buf = serializer.serialize( attrs );
-        AttributesImpl deserialized = ( AttributesImpl ) serializer.deserialize( buf );
+        byte[] buf = AttributesSerializerUtils.serialize( attrs );
+        AttributesImpl deserialized = ( AttributesImpl ) AttributesSerializerUtils.deserialize( buf );
 
         AttributeImpl attrDeserialized0 = ( AttributeImpl ) deserialized.get( "attr0" );
         assertEquals( "value0", attrDeserialized0.get() );

Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java Thu Sep 13 16:27:38 2007
@@ -80,7 +80,7 @@
 public class OperationFactory
 {
     private final ReplicaId replicaId;
-    private final Map environment;
+    private final Map<String, Object> environment;
     private final PartitionNexus nexus;
     private final UUIDFactory uuidFactory;
     private final CSNFactory csnFactory;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java?rev=575496&r1=575495&r2=575496&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java Thu Sep 13 16:27:38 2007
@@ -34,21 +34,21 @@
 public class SingletonEnumeration<T> implements NamingEnumeration<T>
 {
     /** The singleton element to return */
-    private final T m_element;
+    private final T element;
 
     /** Can we return a element */
-    private boolean m_hasMore = true;
+    private boolean hasMore = true;
 
 
     /**
      * Creates a NamingEnumeration over a single element.
      * 
-     * @param a_element
+     * @param element
      *            TODO
      */
-    public SingletonEnumeration(final T a_element)
+    public SingletonEnumeration(final T element)
     {
-        m_element = a_element;
+        this.element = element;
     }
 
 
@@ -59,7 +59,7 @@
      */
     public void close()
     {
-        m_hasMore = false;
+        hasMore = false;
     }
 
 
@@ -68,7 +68,7 @@
      */
     public boolean hasMore()
     {
-        return m_hasMore;
+        return hasMore;
     }
 
 
@@ -77,10 +77,10 @@
      */
     public T next()
     {
-        if ( m_hasMore )
+        if ( hasMore )
         {
-            m_hasMore = false;
-            return m_element;
+            hasMore = false;
+            return element;
         }
 
         throw new NoSuchElementException();
@@ -92,7 +92,7 @@
      */
     public boolean hasMoreElements()
     {
-        return m_hasMore;
+        return hasMore;
     }
 
 



Mime
View raw message