directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r761252 - in /directory/apacheds/branches/ldif-partition: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ core-avl/src/main/java/org/apache/directory/server/core/avltree/ core-avl/src/test/java/org/apache/directo...
Date Thu, 02 Apr 2009 11:32:59 GMT
Author: akarasulu
Date: Thu Apr  2 11:32:58 2009
New Revision: 761252

URL: http://svn.apache.org/viewvc?rev=761252&view=rev
Log:
renaming AvlTreeMap to AvlTreeMapImpl to extract interface

Added:
    directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapImpl.java
      - copied, changed from r761222, directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
Removed:
    directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
Modified:
    directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
    directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursor.java
    directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
    directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java

Modified: directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java?rev=761252&r1=761251&r2=761252&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
(original)
+++ directory/apacheds/branches/ldif-partition/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
Thu Apr  2 11:32:58 2009
@@ -24,7 +24,7 @@
 
 import org.apache.directory.server.core.avltree.AvlTree;
 import org.apache.directory.server.core.avltree.AvlTreeCursor;
-import org.apache.directory.server.core.avltree.AvlTreeMap;
+import org.apache.directory.server.core.avltree.AvlTreeMapImpl;
 import org.apache.directory.server.core.avltree.AvlTreeMapNoDupsCursor;
 import org.apache.directory.server.core.avltree.KeyTupleAvlCursor;
 import org.apache.directory.server.core.avltree.LinkedAvlMapNode;
@@ -43,7 +43,7 @@
  */
 public class AvlTable<K, V> implements Table<K, V>
 {
-    private final AvlTreeMap<K, V> avl;
+    private final AvlTreeMapImpl<K, V> avl;
     private final String name;
     private final Comparator<K> keyComparator;
     private final Comparator<V> valComparator;
@@ -55,7 +55,7 @@
         this.name = name;
         this.keyComparator = keyComparator;
         this.valComparator = valComparator;
-        this.avl = new AvlTreeMap<K, V>( keyComparator, valComparator, dupsEnabled
);
+        this.avl = new AvlTreeMapImpl<K, V>( keyComparator, valComparator, dupsEnabled
);
     }
     
 
@@ -449,7 +449,7 @@
      *
      * @return AvlTreeMap used to store Tuples
      */
-    AvlTreeMap<K,V> getAvlTreeMap()
+    AvlTreeMapImpl<K,V> getAvlTreeMap()
     {
         return avl;
     }

Copied: directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapImpl.java
(from r761222, directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapImpl.java?p2=directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapImpl.java&p1=directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java&r1=761222&r2=761252&rev=761252&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
(original)
+++ directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapImpl.java
Thu Apr  2 11:32:58 2009
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class AvlTreeMap<K,V>
+public class AvlTreeMapImpl<K,V>
 {
     /** the root of the tree */
     private LinkedAvlMapNode<K,V> root;
@@ -59,13 +59,13 @@
      *
      * @param comparator1 the comparator to be used for comparing keys
      */
-    public AvlTreeMap( Comparator<K> keyComparator, Comparator<V> valueComparator
)
+    public AvlTreeMapImpl( Comparator<K> keyComparator, Comparator<V> valueComparator
)
     {
         this( keyComparator, valueComparator, false );
     }
     
 
-    public AvlTreeMap( Comparator<K> keyComparator, Comparator<V> valueComparator,
boolean allowDuplicates )
+    public AvlTreeMapImpl( Comparator<K> keyComparator, Comparator<V> valueComparator,
boolean allowDuplicates )
     {
         this.keyComparator = keyComparator;
         this.valueComparator = valueComparator;

Modified: directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursor.java?rev=761252&r1=761251&r2=761252&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursor.java
(original)
+++ directory/apacheds/branches/ldif-partition/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursor.java
Thu Apr  2 11:32:58 2009
@@ -33,14 +33,14 @@
  */
 public class AvlTreeMapNoDupsCursor<K,V> extends AbstractTupleCursor<K,V>
 {
-    private AvlTreeMap<K,V> tree;
+    private AvlTreeMapImpl<K,V> tree;
     private LinkedAvlMapNode<K,V> node;
     private boolean onNode = false;
     private boolean isAfterLast = false;
     private boolean isBeforeFirst = true;
     private Tuple<K,V> returnedTuple = new Tuple<K,V>();
     
-    public AvlTreeMapNoDupsCursor( AvlTreeMap<K,V> tree )
+    public AvlTreeMapNoDupsCursor( AvlTreeMapImpl<K,V> tree )
     {
         this.tree = tree;
     }

Modified: directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java?rev=761252&r1=761251&r2=761252&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
(original)
+++ directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
Thu Apr  2 11:32:58 2009
@@ -43,7 +43,7 @@
  */
 public class AvlTreeMapNoDupsCursorTest
 {
-    AvlTreeMap<Integer, Integer> tree;
+    AvlTreeMapImpl<Integer, Integer> tree;
 
     AvlTreeMapNoDupsCursor<Integer, Integer> cursor;
 
@@ -61,7 +61,7 @@
 
         };
 
-        tree = new AvlTreeMap<Integer, Integer>( comparator, comparator, true );
+        tree = new AvlTreeMapImpl<Integer, Integer>( comparator, comparator, true );
 
         cursor = new AvlTreeMapNoDupsCursor<Integer, Integer>( tree );
     }

Modified: directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java?rev=761252&r1=761251&r2=761252&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java
(original)
+++ directory/apacheds/branches/ldif-partition/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java
Thu Apr  2 11:32:58 2009
@@ -45,7 +45,7 @@
 public class AvlTreeMapTest
 {
 
-    AvlTreeMap<Integer, Integer> tree;
+    AvlTreeMapImpl<Integer, Integer> tree;
 
     private static final Logger LOG = LoggerFactory.getLogger( AvlTreeTest.class );
 
@@ -63,7 +63,7 @@
     @Before
     public void createTree()
     {
-        tree = new AvlTreeMap<Integer, Integer>( comparator, comparator, true );
+        tree = new AvlTreeMapImpl<Integer, Integer>( comparator, comparator, true );
     }
 
 
@@ -117,7 +117,7 @@
     public void testInsertWithReplace()
     {
         // to override the value tree should disable duplicate keys
-        tree = new AvlTreeMap<Integer, Integer>( comparator, comparator, false );
+        tree = new AvlTreeMapImpl<Integer, Integer>( comparator, comparator, false
);
         
         assertNull( tree.insert( 43, 891 ) );
         assertEquals( 891, tree.find( 43 ).getValue().intValue() );



Mime
View raw message