FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TreeSet.java (clone): Call TreeMap.clone(), not Object.clone().

Browse source 
* java/util/TreeSet.java (clone): Call TreeMap.clone(), not
	Object.clone().
	* java/util/Collections.java (ReverseComparator): New static class.
	(reverseOrder): Return static instance of ReverseComparator.

From-SVN: r39705
This commit is contained in:
Bryce McKinlay 2001-02-15 03:59:57 +00:00 • committed by Bryce McKinlay
parent 78e3e6aca3
commit 505ce70d3f
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -1,3 +1,10 @@
2001-02-15 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/TreeSet.java (clone): Call TreeMap.clone(), not
Object.clone().
* java/util/Collections.java (ReverseComparator): New static class.
(reverseOrder): Return static instance of ReverseComparator.
2001-02-14 Bryce McKinlay <bryce@albatross.co.nz>
* java/util/TreeMap.java: New file.

20
libjava/java/util/Collections.java
View file

@ -447,7 +447,6 @@ public class Collections
// Create a minimal implementation of List
return new AbstractList()
{
public int size()
{
return n;
@ -487,22 +486,25 @@ public class Collections
}
}
static class ReverseComparator implements Comparator, Serializable
{
public int compare(Object a, Object b)
{
return -((Comparable) a).compareTo(b);
}
}
static ReverseComparator rcInstance = new ReverseComparator();
/**
* Get a comparator that implements the reverse of natural ordering. This is
* intended to make it easy to sort into reverse order, by simply passing
* Collections.reverseOrder() to the sort method. The return value of this
* method is Serializable.
*/
// The return value isn't Serializable, because the spec is broken.
public static Comparator reverseOrder()
{
return new Comparator()
{
public int compare(Object a, Object b)
{
return -((Comparable) a).compareTo(b);
}
};
return rcInstance;
}
/**

13
libjava/java/util/TreeSet.java
View file

@ -44,8 +44,8 @@ import java.io.ObjectOutputStream;
* TreeSet is a part of the JDK1.2 Collections API.
*
* @author Jon Zeppieri
* @version $Revision: 1.7 $
* @modified $Id: TreeSet.java,v 1.7 2000/10/26 10:19:01 bryce Exp $
* @version $Revision: 1.1 $
* @modified $Id: TreeSet.java,v 1.1 2001/02/14 04:44:21 bryce Exp $
*/
public class TreeSet extends AbstractSet
@ -158,14 +158,7 @@ public class TreeSet extends AbstractSet
public Object clone()
{
TreeSet copy = new TreeSet();
try
{
copy.map = (TreeMap) map.clone();
}
catch (CloneNotSupportedException ex)
{
}
copy.map = (SortedMap) ((TreeMap) map).clone();
return copy;
}