directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r697739 - in /directory: apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/ apacheds/trunk/core/src/test/java/org/apache/directory/server/core/pa...
Date Mon, 22 Sep 2008 09:33:40 GMT
Author: elecharny
Date: Mon Sep 22 02:33:40 2008
New Revision: 697739

URL: http://svn.apache.org/viewvc?rev=697739&view=rev
Log:
o Renamed the Node, LeafNode and BrancheNode to avoid a name collision

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
      - copied, changed from r697633, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/BranchNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnLeafNode.java
      - copied, changed from r697581, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/LeafNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java
      - copied, changed from r697581, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/Node.java
Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManager.java?rev=697739&r1=697738&r2=697739&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManager.java
Mon Sep 22 02:33:40 2008
@@ -73,6 +73,7 @@
      * The manager will search for every entries having a Referral ObjectClass.
      *
      * @param directoryService The associated LDAP service
+     * @exception If the initialization failed
      */
-    void init( DirectoryService directoryService );
+    void init( DirectoryService directoryService ) throws Exception;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=697739&r1=697738&r2=697739&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Mon Sep 22 02:33:40 2008
@@ -82,9 +82,9 @@
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.apache.directory.shared.ldap.util.StringTools;
-import org.apache.directory.shared.ldap.util.tree.BranchNode;
-import org.apache.directory.shared.ldap.util.tree.LeafNode;
-import org.apache.directory.shared.ldap.util.tree.Node;
+import org.apache.directory.shared.ldap.util.tree.DnBranchNode;
+import org.apache.directory.shared.ldap.util.tree.DnLeafNode;
+import org.apache.directory.shared.ldap.util.tree.DnNode;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -136,7 +136,7 @@
     private Map<String, Partition> partitions = new HashMap<String, Partition>();
     
     /** A structure to hold all the partitions */
-    private BranchNode<Partition> partitionLookupTree = new BranchNode<Partition>();
+    private DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
     
     /** the read only rootDSE attributes */
     private final ServerEntry rootDSE;
@@ -670,7 +670,7 @@
         synchronized ( partitionLookupTree )
         {
             partitions.remove( key );
-            partitionLookupTree = new BranchNode<Partition>();
+            partitionLookupTree = new DnBranchNode<Partition>();
             
             for ( Partition part : partitions.values() )
             {
@@ -1065,7 +1065,7 @@
         // partitionList when it is modified.
         synchronized ( partitionLookupTree )
         {
-            Node<Partition> currentNode = partitionLookupTree;
+            DnNode<Partition> currentNode = partitionLookupTree;
 
             // Iterate through all the RDN until we find the associated partition
             while ( rdns.hasMoreElements() )
@@ -1077,20 +1077,20 @@
                     break;
                 }
 
-                if ( currentNode instanceof LeafNode )
+                if ( currentNode instanceof DnLeafNode )
                 {
-                    return ( ( LeafNode<Partition> ) currentNode ).getElement();
+                    return ( ( DnLeafNode<Partition> ) currentNode ).getElement();
                 }
 
-                BranchNode<Partition> currentBranch = ( BranchNode<Partition>
) currentNode;
+                DnBranchNode<Partition> currentBranch = ( DnBranchNode<Partition>
) currentNode;
                 
                 if ( currentBranch.contains( rdn ) )
                 {
                     currentNode = currentBranch.getChild( rdn );
                     
-                    if ( currentNode instanceof LeafNode )
+                    if ( currentNode instanceof DnLeafNode )
                     {
-                        return ( ( LeafNode<Partition> ) currentNode ).getElement();
+                        return ( ( DnLeafNode<Partition> ) currentNode ).getElement();
                     }
                 }
             }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=697739&r1=697738&r2=697739&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
Mon Sep 22 02:33:40 2008
@@ -25,9 +25,9 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.util.tree.BranchNode;
-import org.apache.directory.shared.ldap.util.tree.LeafNode;
-import org.apache.directory.shared.ldap.util.tree.Node;
+import org.apache.directory.shared.ldap.util.tree.DnBranchNode;
+import org.apache.directory.shared.ldap.util.tree.DnLeafNode;
+import org.apache.directory.shared.ldap.util.tree.DnNode;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
@@ -50,24 +50,24 @@
     @Test public void testNewPartitionTree() throws NamingException
     {
         /** A structure to hold all the partitions */
-        BranchNode<Partition> partitionLookupTree = new BranchNode<Partition>();
+        DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
         LdapDN suffix = new LdapDN( "dc=example, dc=com" );
         Partition partition = new JdbmPartition();
         partition.setSuffix( suffix.getUpName() );
         
-        Node<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix, 0, partition );
+        DnNode<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix, 0, partition );
         
         assertNotNull( node );
-        assertTrue( node instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)node).contains( "dc=com" ) );
+        assertTrue( node instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)node).contains( "dc=com" ) );
         
-        Node<Partition> child = ((BranchNode<Partition>)node).getChild( "dc=com"
);
-        assertTrue( child instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)child).contains( "dc=example" ) );
+        DnNode<Partition> child = ((DnBranchNode<Partition>)node).getChild( "dc=com"
);
+        assertTrue( child instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)child).contains( "dc=example" ) );
 
-        child = ((BranchNode<Partition>)child).getChild( "dc=example" );
-        assertEquals( "dc=example, dc=com", ((LeafNode<Partition>)child).getElement().getSuffix()
);
+        child = ((DnBranchNode<Partition>)child).getChild( "dc=example" );
+        assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffix()
);
     }
 
 
@@ -77,13 +77,13 @@
     @Test public void testNewPartitionTree2Nodes() throws NamingException
     {
         /** A structure to hold all the partitions */
-        BranchNode<Partition> partitionLookupTree = new BranchNode<Partition>();
+        DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
         LdapDN suffix1 = new LdapDN( "dc=example, dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1.getUpName() );
         
-        Node<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix1, 0, partition1 );
+        DnNode<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix1, 0, partition1 );
         
         LdapDN suffix2 = new LdapDN( "ou=system" );
         Partition partition2 = new JdbmPartition();
@@ -92,21 +92,21 @@
         node = partitionLookupTree.recursivelyAddElement( partitionLookupTree, suffix2, 0,
partition2 );
 
         assertNotNull( node );
-        assertTrue( node instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)node).contains( "ou=system" ) );
-        assertTrue( ((BranchNode<Partition>)node).contains( "dc=com" ) );
-        
-        Node<Partition> child = ((BranchNode<Partition>)node).getChild( "ou=system"
);
-        assertTrue( child instanceof LeafNode );
-        assertEquals( "ou=system", ((LeafNode<Partition>)child).getElement().getSuffix()
);
-
-        child = ((BranchNode<Partition>)node).getChild( "dc=com" );
-        assertTrue( child instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)child).contains( "dc=example" ) );
-        
-        child = ((BranchNode<Partition>)child).getChild( "dc=example" );
-        assertTrue( child instanceof LeafNode );
-        assertEquals( "dc=example, dc=com", ((LeafNode<Partition>)child).getElement().getSuffix()
);
+        assertTrue( node instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)node).contains( "ou=system" ) );
+        assertTrue( ((DnBranchNode<Partition>)node).contains( "dc=com" ) );
+        
+        DnNode<Partition> child = ((DnBranchNode<Partition>)node).getChild( "ou=system"
);
+        assertTrue( child instanceof DnLeafNode );
+        assertEquals( "ou=system", ((DnLeafNode<Partition>)child).getElement().getSuffix()
);
+
+        child = ((DnBranchNode<Partition>)node).getChild( "dc=com" );
+        assertTrue( child instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)child).contains( "dc=example" ) );
+        
+        child = ((DnBranchNode<Partition>)child).getChild( "dc=example" );
+        assertTrue( child instanceof DnLeafNode );
+        assertEquals( "dc=example, dc=com", ((DnLeafNode<Partition>)child).getElement().getSuffix()
);
     }
 
 
@@ -116,7 +116,7 @@
     @Test public void testNewPartitionTree2OverlapingNodes() throws NamingException
     {
         /** A structure to hold all the partitions */
-        BranchNode<Partition> partitionLookupTree = new BranchNode<Partition>();
+        DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
         LdapDN suffix1 = new LdapDN( "dc=com" );
         Partition partition1 = new JdbmPartition();
@@ -146,7 +146,7 @@
     @Test public void testNewPartitionTree2NodesWithSameRoot() throws NamingException
     {
         /** A structure to hold all the partitions */
-        BranchNode<Partition> partitionLookupTree = new BranchNode<Partition>();
+        DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
         LdapDN suffix1 = new LdapDN( "dc=example1, dc=com" );
         Partition partition1 = new JdbmPartition();
@@ -158,27 +158,27 @@
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2.getUpName() );
         
-        Node<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix2, 0, partition2 );
+        DnNode<Partition> node = partitionLookupTree.recursivelyAddElement( partitionLookupTree,
suffix2, 0, partition2 );
 
         assertNotNull( node );
         
-        assertTrue( node instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)node).contains( "dc=com" ) );
+        assertTrue( node instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)node).contains( "dc=com" ) );
         
-        Node<Partition> child = ((BranchNode<Partition>)node).getChild( "dc=com"
);
-        assertTrue( child instanceof BranchNode );
+        DnNode<Partition> child = ((DnBranchNode<Partition>)node).getChild( "dc=com"
);
+        assertTrue( child instanceof DnBranchNode );
 
-        child = ((BranchNode<Partition>)node).getChild( "dc=com" );
-        assertTrue( child instanceof BranchNode );
-        assertTrue( ((BranchNode<Partition>)child).contains( "dc=example1" ) );
-        assertTrue( ((BranchNode<Partition>)child).contains( "dc=example2" ) );
-        
-        Node<Partition> child1 = ((BranchNode<Partition>)child).getChild( "dc=example1"
);
-        assertTrue( child1 instanceof LeafNode );
-        assertEquals( "dc=example1, dc=com", ((LeafNode<Partition>)child1).getElement().getSuffix()
);
-
-        Node<Partition> child2 = ((BranchNode<Partition>)child).getChild( "dc=example1"
);
-        assertTrue( child2 instanceof LeafNode );
-        assertEquals( "dc=example1, dc=com", ((LeafNode<Partition>)child2).getElement().getSuffix()
);
+        child = ((DnBranchNode<Partition>)node).getChild( "dc=com" );
+        assertTrue( child instanceof DnBranchNode );
+        assertTrue( ((DnBranchNode<Partition>)child).contains( "dc=example1" ) );
+        assertTrue( ((DnBranchNode<Partition>)child).contains( "dc=example2" ) );
+        
+        DnNode<Partition> child1 = ((DnBranchNode<Partition>)child).getChild(
"dc=example1" );
+        assertTrue( child1 instanceof DnLeafNode );
+        assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child1).getElement().getSuffix()
);
+
+        DnNode<Partition> child2 = ((DnBranchNode<Partition>)child).getChild(
"dc=example1" );
+        assertTrue( child2 instanceof DnLeafNode );
+        assertEquals( "dc=example1, dc=com", ((DnLeafNode<Partition>)child2).getElement().getSuffix()
);
     }
 }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
(from r697633, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/BranchNode.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/BranchNode.java&r1=697633&r2=697739&rev=697739&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/BranchNode.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
Mon Sep 22 02:33:40 2008
@@ -20,11 +20,13 @@
 package org.apache.directory.shared.ldap.util.tree;
 
 
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.naming.NamingException;
 
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,26 +40,26 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BranchNode<N> implements Node<N>
+public class DnBranchNode<N> implements DnNode<N>
 {
     /** The logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( BranchNode.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DnBranchNode.class );
 
     /** Stores the list of all the descendant */
-    private Map<String, Node<N>> children;
+    private Map<String, DnNode<N>> children;
     
     
     /**
-     * Creates a new instance of a BranchNode.
+     * Creates a new instance of a DnBranchNode.
      */
-    public BranchNode()
+    public DnBranchNode()
     {
-        children = new HashMap<String, Node<N>>(3);
+        children = new HashMap<String, DnNode<N>>(3);
     }
 
     
     /**
-     * @see Node#isLeaf()
+     * @see DnNode#isLeaf()
      */
     public boolean isLeaf()
     {
@@ -76,19 +78,19 @@
      * @param element The associated element to add as a tree node
      * @return The modified tree structure.
      */
-    public Node<N> recursivelyAddElement( BranchNode<N> current, LdapDN dn, int
index, N element ) throws NamingException
+    public DnNode<N> recursivelyAddElement( DnBranchNode<N> current, LdapDN dn,
int index, N element ) throws NamingException
     {
         String rdnAtIndex = dn.getRdn( index ).toString();
         
         if ( index == dn.size() - 1 )
         {
-            return current.addNode( rdnAtIndex, new LeafNode<N>( element ) );
+            return current.addNode( rdnAtIndex, new DnLeafNode<N>( element ) );
         }
         else
         {
-            Node<N> newNode = ((BranchNode<N>)current).getChild( rdnAtIndex );
+            DnNode<N> newNode = ((DnBranchNode<N>)current).getChild( rdnAtIndex
);
             
-            if ( newNode instanceof LeafNode )
+            if ( newNode instanceof DnLeafNode )
             {
                 String message = "Overlapping partitions are not allowed";
                 LOG.error( message );
@@ -97,23 +99,23 @@
         
             if ( newNode == null )
             {
-                newNode = new BranchNode<N>();
+                newNode = new DnBranchNode<N>();
             }
 
-            Node<N> child = recursivelyAddElement( (BranchNode<N>)newNode, dn,
index + 1, element );
+            DnNode<N> child = recursivelyAddElement( (DnBranchNode<N>)newNode,
dn, index + 1, element );
             return current.addNode( rdnAtIndex, child );
         }
     }
     
     
     /**
-     * Directly adds a new child Node to the current BranchNode.
+     * Directly adds a new child DnNode to the current DnBranchNode.
      *
      * @param rdn The rdn of the child node to add 
      * @param child The child node to add
      * @return The modified branch node after the insertion
      */
-    public Node<N> addNode( String rdn, Node<N> child )
+    public DnNode<N> addNode( String rdn, DnNode<N> child )
     {
         children.put( rdn, child );
         return this;
@@ -121,7 +123,7 @@
     
     
     /**
-     * Tells if the current BranchNode contains another node associated 
+     * Tells if the current DnBranchNode contains another node associated 
      * with an rdn.
      *
      * @param rdn The name we are looking for
@@ -139,7 +141,7 @@
      * @param rdn the rdn to use as the node key
      * @return the child node corresponding to the rdn.
      */
-    public Node<N> getChild( String rdn )
+    public DnNode<N> getChild( String rdn )
     {
         if ( children.containsKey( rdn ) )
         {
@@ -159,7 +161,7 @@
         sb.append( "{" );
         boolean isFirst = true;
         
-        for ( Node<N> child:children.values() )
+        for ( DnNode<N> child:children.values() )
         {
             if ( isFirst )
             {
@@ -170,7 +172,7 @@
                 sb.append(  ", " );
             }
 
-            if ( child instanceof BranchNode )
+            if ( child instanceof DnBranchNode )
             {
                 sb.append( "Branch: ").append( child.toString() );
             }
@@ -183,4 +185,54 @@
         sb.append( "}" );
         return sb.toString();
     }
+    
+    
+    /**
+     * Gets the partition associated with a normalized dn.
+     *
+     * @param dn the normalized distinguished name to resolve to a partition
+     * @return the backend partition associated with the normalized dn
+     * @throws Exception if the name cannot be resolved to a partition
+     */
+    public N getElement( DnBranchNode<N> tree, LdapDN dn ) throws Exception
+    {
+        Enumeration<String> rdns = dn.getAll();
+        
+        // This is synchronized so that we can't read the
+        // partitionList when it is modified.
+        synchronized ( tree )
+        {
+            DnNode<N> currentNode = tree;
+
+            // Iterate through all the RDN until we find the associated partition
+            while ( rdns.hasMoreElements() )
+            {
+                String rdn = rdns.nextElement();
+
+                if ( currentNode == null )
+                {
+                    break;
+                }
+
+                if ( currentNode instanceof DnLeafNode )
+                {
+                    return ( ( DnLeafNode<N> ) currentNode ).getElement();
+                }
+
+                DnBranchNode<N> currentBranch = ( DnBranchNode<N> ) currentNode;
+                
+                if ( currentBranch.contains( rdn ) )
+                {
+                    currentNode = currentBranch.getChild( rdn );
+                    
+                    if ( currentNode instanceof DnLeafNode )
+                    {
+                        return ( ( DnLeafNode<N> ) currentNode ).getElement();
+                    }
+                }
+            }
+        }
+        
+        throw new LdapNameNotFoundException( dn.getUpName() );
+    }
 }

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnLeafNode.java
(from r697581, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/LeafNode.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnLeafNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnLeafNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/LeafNode.java&r1=697581&r2=697739&rev=697739&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/LeafNode.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnLeafNode.java
Mon Sep 22 02:33:40 2008
@@ -25,25 +25,25 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LeafNode<N> implements Node<N>
+public class DnLeafNode<N> implements DnNode<N>
 {
     /** The stored partition */
     private N element;
 
     
     /**
-     * Creates a new instance of LeafNode.
+     * Creates a new instance of DnLeafNode.
      *
      * @param element the element to store
      */
-    public LeafNode( N element )
+    public DnLeafNode( N element )
     {
         this.element = element;
     }
 
     
     /**
-     * @see Node#isLeaf()
+     * @see DnNode#isLeaf()
      */
     public boolean isLeaf()
     {

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java
(from r697581, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/Node.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/Node.java&r1=697581&r2=697739&rev=697739&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/Node.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java
Mon Sep 22 02:33:40 2008
@@ -28,7 +28,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface Node<N>
+public interface DnNode<N>
 {
     /**
      * Tells if the implementation is a leaf node. If it's a branch node



Mime
View raw message