Commit Graph

225 Commits

Author SHA1 Message Date
Michael Smith 63cf00bf0e Made BeanMap.values() and BeanMap.keySet() unmodifiable. This brings it more
in line with the Map contract where any modifications will throw
UnsupportedOperationException rather than allow modifications that are not
reflected in the underlying map.  This also keeps values(), keySet() and
entrySet() consistent with each other.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130673 13f79535-47bb-0310-9956-ffa450edef68
2002-03-24 21:53:27 +00:00
Michael Smith 302cc6fd28 Rather than throw a NullPointerException during hasMoreElements or nextElement
when no array is passed to the constructor, treat a null to the constructor as
an empty array.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130672 13f79535-47bb-0310-9956-ffa450edef68
2002-03-24 21:50:24 +00:00
Morgan James Delagrange 6d367b97f7 javadocs
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130671 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 17:11:01 +00:00
Michael Smith 11328e166e Submitted by Daniel Rall:
"The definition of "delegate" at the beginning of the header JavaDoc is
mostly meaningless, since the class was renamed to and committed with
the name ProxyMap."


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130670 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 03:31:09 +00:00
Morgan James Delagrange 79b299a70c javadocs
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130669 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:09:16 +00:00
Michael Smith f62b8ed900 Fix javadoc warnings
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130668 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 05:16:24 +00:00
Michael Smith d0d74a4e1a Fix deviation from Comparator contract
[sgn(compare(x, y)) == -sgn(compare(y, x))]

Eliminate multiplication by switching order of objects passed to
underlying comparator.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130667 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 00:25:37 +00:00
Morgan James Delagrange 96cd122c69 pre-release change to the Serialization format
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130666 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 22:26:20 +00:00
Morgan James Delagrange 54c23b2da3 now throws an exception for comparisons on an empty chain and
added no-op constructor


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130665 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 22:25:58 +00:00
Michael Smith fedb457600 Fixed API to use new interfaces defined by PriorityQueue. Now supports
objects that do not implement comparable.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130664 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 13:19:13 +00:00
Michael Smith 742ffb2d8d Added static method to retrieve a shared instance.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130663 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 05:09:05 +00:00
Michael Smith ea8731a374 Fixed copyright date in license of TestBinaryHeap and added myself as an
author for BinaryHeap for my recent changes.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130662 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 04:49:00 +00:00
Michael Smith d5ca0eeb3c Changed PriorityQueue and BinaryHeap to allow objects that do not
implement Comparable.  BinaryHeap implements this by accepting an
optional Comparator in its constructor.  If no comparator is specified,
the object's natural ordering is used (i.e. it is cast to a Comparable
and compared using its compareTo method)

Also added basic tests for BinaryHeap


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130661 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 04:34:18 +00:00
Michael Smith 94a2ba779b Test for null passed to setArray in addition to passing null to the
constructor.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130660 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 01:37:40 +00:00
Michael Smith d6a2418582 Documentation updates and new test case for specifying null to the
ArrayIterator constructor or the setArray(Object) method.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130659 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 01:33:12 +00:00
Jeff Turner 96b336fb95 Show protected methods in javadocs. We have a few {@link}s to protected
methods that were causing warnings.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130658 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 01:21:53 +00:00
Jeff Turner 67282865fa Fix javadoc warning
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130657 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 01:18:09 +00:00
Michael Smith 25e0dd13fd If object is not an array, fail on from the constructor or from
setArray rather than from hasNext or next.  This gives a more
fail-fast behavior.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130656 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 00:54:34 +00:00
Morgan James Delagrange 655353ba07 using the ArrayIterator.setArray(Object) method no longer produces an out of bounds
exception


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130655 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 00:11:56 +00:00
Morgan James Delagrange 236ad31fbd using the setArray(Object) method no longer produces an out of bounds
exception


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130654 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 00:05:16 +00:00
Morgan James Delagrange 00be90bccc deprecated ArrayEnumeration
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130653 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 23:51:05 +00:00
Morgan James Delagrange 6c8d4b8fc7 javadoc fix
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130652 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 17:33:52 +00:00
Morgan James Delagrange 09451a1f93 fixed bad linefeeds
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130651 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 17:33:23 +00:00
Morgan James Delagrange 9bf049746b added more documentation to the release
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130650 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 17:28:41 +00:00
Morgan James Delagrange 46d1aa3509 updating release version
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130649 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 17:07:08 +00:00
Morgan James Delagrange fd18f108af added ProxyMap for collections 2.0
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130648 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 05:41:23 +00:00
Morgan James Delagrange fac6539a56 added for collections 2.0, fixed spelling of Daniel's name :)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130647 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 05:37:21 +00:00
Morgan James Delagrange 312f353b21 added for collections 2.0
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130646 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 05:36:58 +00:00
Morgan James Delagrange a9131afbd5 removed expectation of order from iterator tests
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130645 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 18:10:33 +00:00
Morgan James Delagrange fee42d4188 fixed bad line feeds
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130644 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 18:00:51 +00:00
Michael Smith 976b14463e Update release notes for Bag and BeanMap changes.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130643 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 06:07:14 +00:00
Michael Smith 008dc5f8da Remove incorrect comment about using hashCode to determine whether
objects in the bag are equal.

Fix numerous javadoc cross reference problems.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130642 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 06:00:20 +00:00
Michael Smith cfb9865f41 Removed bad line-endings (multiple ^Ms).
Thanks to Christopher Elkins.
see: http://www.mail-archive.com/commons-dev@jakarta.apache.org/msg04102.html


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130641 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 05:40:31 +00:00
Michael Smith 7733e2f193 Fixed typo in documentation.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130640 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 05:24:58 +00:00
Michael Smith f35291ee5c *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130639 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:59:03 +00:00
Michael Smith 33ac6121a5 Fixed bugs where methods failed when there is no bean set for the bean map.
Fixed entrySet() to return a set containing Map.Entry objects with readable
properties as keys.  This fixes the test case error, and a couple of the test
case failures (and uncovers a couple more test case failures)

Fixed clone method to allow subclasses to clone properly.  This requires a
non-backwards compatible change where the clone method now declares it throws
CloneNotSupportedException.  See:
http://www.javaworld.com/javaworld/jw-01-1999/jw-01-object.html Seeing how
BeanMap never directly implemented Cloneable anyway, and this is for a major
revision, I don't see this changing being much of a problem.

Since clone() declares it throws CloneNotSupportedException, that exception is
now used to indicate a problem when attempting to clone (rather than
UnsupportedOperationException, or other RuntimeException).

Added a small test for testing BeanMap clone.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130638 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:36:18 +00:00
Michael Smith fa43060230 Removed ^M's from file because they were causing line numbers to be
reported incorrectly when trying to track down failing test cases.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130637 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:15:49 +00:00
Morgan James Delagrange ae71f5d386 canonical version for Collections 2.0
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130636 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 18:38:26 +00:00
Morgan James Delagrange 3c49cc5368 added the new Comparator classes
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130635 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 18:24:10 +00:00
Morgan James Delagrange d3eae5cb3e added the new Comparator classes
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130634 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 18:17:47 +00:00
Morgan James Delagrange 5155b93eb0 added complete JavaDocs, added isLocked() and size() methods, made
checkLocked() method private


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130633 13f79535-47bb-0310-9956-ffa450edef68
2002-03-04 19:18:56 +00:00
Morgan James Delagrange f247986918 changed List, BitSet constructor to perform a defensive copy into a
new List


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130632 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 23:48:59 +00:00
Morgan James Delagrange c55fe26ab9 added separate methods for setting/changing sort order on a Comparator
in the chain


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130631 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 23:40:43 +00:00
Morgan James Delagrange 21c62eb49c added tests for ComparatorChain class
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130630 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 23:31:35 +00:00
Morgan James Delagrange 8ab9293c64 renamed random sort test to more appropriate reverse sort, and
added real random sort test


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130629 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 23:30:58 +00:00
Morgan James Delagrange 5ae848724e class that allows you to chain comparators together for SQL-like
sorting...more Javadocs to come


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130628 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 23:29:24 +00:00
Morgan James Delagrange ad88fe8d45 added canonical versions of all Comparators
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130627 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 19:43:14 +00:00
Morgan James Delagrange f8d081df0d added backward compatibility tests for Serialization
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130626 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 19:42:42 +00:00
Morgan James Delagrange 61445ae559 no message
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130625 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 19:39:28 +00:00
Morgan James Delagrange 520dc72714 make all Comparators Serializable
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130624 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 19:18:49 +00:00