Committed the DoubleOrderedMap class and associated unit tests (gotta love
it when the unit test source is 50% longer than the class being tested :-). The only change I made was to use the long-form version of the Apache license -- according to the Apache board, that is the only acceptable approach at the moment. Any remaining classes in commons-collections (or elsewhere) using the short form license should be updated. Submitted by: Marc Johnson <marc_johnson27591@hotmail.com> git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130509 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Craig R. McClanahan
parent
3d6c8c5fab
commit
6a5c4a72c6
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
||||||
<!-- $Id: package.html,v 1.4 2001/08/29 15:28:07 jstrachan Exp $ -->
|
<!-- $Id: package.html,v 1.5 2002/01/20 04:36:08 craigmcc Exp $ -->
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>Package Documentation for org.apache.commons.collections</title>
|
<title>Package Documentation for org.apache.commons.collections</title>
|
||||||
|
|
@ -34,7 +34,8 @@
|
||||||
{@link org.apache.commons.collections.FastHashMap}<br>
|
{@link org.apache.commons.collections.FastHashMap}<br>
|
||||||
{@link org.apache.commons.collections.FastTreeMap}<br>
|
{@link org.apache.commons.collections.FastTreeMap}<br>
|
||||||
{@link org.apache.commons.collections.LRUMap}<br>
|
{@link org.apache.commons.collections.LRUMap}<br>
|
||||||
{@link org.apache.commons.collections.SoftRefHashMap}
|
{@link org.apache.commons.collections.SoftRefHashMap}<br>
|
||||||
|
{@link org.apache.commons.collections.DoubleOrderedMap}
|
||||||
</td>
|
</td>
|
||||||
<td valign="top">
|
<td valign="top">
|
||||||
Special-purpose implementations of the {@link
|
Special-purpose implementations of the {@link
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,164 @@
|
||||||
|
/*
|
||||||
|
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/LocalTestNode.java,v 1.1 2002/01/20 04:36:08 craigmcc Exp $
|
||||||
|
* $Revision: 1.1 $
|
||||||
|
* $Date: 2002/01/20 04:36:08 $
|
||||||
|
*
|
||||||
|
* ====================================================================
|
||||||
|
*
|
||||||
|
* The Apache Software License, Version 1.1
|
||||||
|
*
|
||||||
|
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
|
||||||
|
* reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
*
|
||||||
|
* 3. The end-user documentation included with the redistribution, if
|
||||||
|
* any, must include the following acknowlegement:
|
||||||
|
* "This product includes software developed by the
|
||||||
|
* Apache Software Foundation (http://www.apache.org/)."
|
||||||
|
* Alternately, this acknowlegement may appear in the software itself,
|
||||||
|
* if and wherever such third-party acknowlegements normally appear.
|
||||||
|
*
|
||||||
|
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
|
||||||
|
* Foundation" must not be used to endorse or promote products derived
|
||||||
|
* from this software without prior written permission. For written
|
||||||
|
* permission, please contact apache@apache.org.
|
||||||
|
*
|
||||||
|
* 5. Products derived from this software may not be called "Apache"
|
||||||
|
* nor may "Apache" appear in their names without prior written
|
||||||
|
* permission of the Apache Group.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
||||||
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
||||||
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||||
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||||
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
* ====================================================================
|
||||||
|
*
|
||||||
|
* This software consists of voluntary contributions made by many
|
||||||
|
* individuals on behalf of the Apache Software Foundation. For more
|
||||||
|
* information on the Apache Software Foundation, please see
|
||||||
|
* <http://www.apache.org/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.apache.commons.collections;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class LocalTestNode
|
||||||
|
*
|
||||||
|
* a helper class for TestDoubleOrderedMap
|
||||||
|
*
|
||||||
|
* @author Marc Johnson (marcj at users dot sourceforge dot net)
|
||||||
|
*/
|
||||||
|
class LocalTestNode implements Comparable {
|
||||||
|
|
||||||
|
private Comparable key;
|
||||||
|
private Comparable value;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* construct a LocalTestNode
|
||||||
|
*
|
||||||
|
* @param key value used to create the key and value
|
||||||
|
*/
|
||||||
|
LocalTestNode(final int key) {
|
||||||
|
this.key = new Integer(key);
|
||||||
|
this.value = String.valueOf(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param key the unique key associated with the current node.
|
||||||
|
*/
|
||||||
|
void setKey(Comparable key) {
|
||||||
|
this.key = key;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the unique key associated with the current node
|
||||||
|
*/
|
||||||
|
Comparable getKey() {
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param value the unique value associated with the current node.
|
||||||
|
*/
|
||||||
|
void setValue(Comparable value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the unique value associated with the current node
|
||||||
|
*/
|
||||||
|
Comparable getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method compareTo
|
||||||
|
*
|
||||||
|
* @param o
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public int compareTo(Object o) {
|
||||||
|
|
||||||
|
LocalTestNode other = (LocalTestNode) o;
|
||||||
|
int rval = getKey().compareTo(other.getKey());
|
||||||
|
|
||||||
|
if (rval == 0) {
|
||||||
|
rval = getValue().compareTo(other.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
return rval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method equals
|
||||||
|
*
|
||||||
|
* @param o
|
||||||
|
*
|
||||||
|
* @return true if equal
|
||||||
|
*/
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
|
||||||
|
if (o == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(o.getClass().equals(this.getClass()))) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LocalTestNode node = (LocalTestNode) o;
|
||||||
|
|
||||||
|
return (getKey().equals(node.getKey())
|
||||||
|
&& getValue().equals(node.getValue()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return hash code
|
||||||
|
*/
|
||||||
|
public int hashCode() {
|
||||||
|
return getKey().hashCode() ^ getValue().hashCode();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.13 2001/09/18 10:41:39 jstrachan Exp $
|
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.14 2002/01/20 04:36:08 craigmcc Exp $
|
||||||
* $Revision: 1.13 $
|
* $Revision: 1.14 $
|
||||||
* $Date: 2001/09/18 10:41:39 $
|
* $Date: 2002/01/20 04:36:08 $
|
||||||
*
|
*
|
||||||
* ====================================================================
|
* ====================================================================
|
||||||
*
|
*
|
||||||
|
|
@ -66,7 +66,7 @@ import junit.framework.*;
|
||||||
/**
|
/**
|
||||||
* Entry point for all Collections tests.
|
* Entry point for all Collections tests.
|
||||||
* @author Rodney Waldhoff
|
* @author Rodney Waldhoff
|
||||||
* @version $Id: TestAll.java,v 1.13 2001/09/18 10:41:39 jstrachan Exp $
|
* @version $Id: TestAll.java,v 1.14 2002/01/20 04:36:08 craigmcc Exp $
|
||||||
*/
|
*/
|
||||||
public class TestAll extends TestCase {
|
public class TestAll extends TestCase {
|
||||||
public TestAll(String testName) {
|
public TestAll(String testName) {
|
||||||
|
|
@ -95,6 +95,7 @@ public class TestAll extends TestCase {
|
||||||
suite.addTest(TestSingletonIterator.suite());
|
suite.addTest(TestSingletonIterator.suite());
|
||||||
suite.addTest(TestTreeBag.suite());
|
suite.addTest(TestTreeBag.suite());
|
||||||
suite.addTest(TestTreeMap.suite());
|
suite.addTest(TestTreeMap.suite());
|
||||||
|
suite.addTest(TestDoubleOrderedMap.suite());
|
||||||
return suite;
|
return suite;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue