ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/TreeSet.java

Comparing jsr166/src/main/java/util/TreeSet.java (file contents):
Revision 1.8 by jsr166, Mon May 2 18:38:53 2005 UTC vs.
Revision 1.9 by jsr166, Mon May 2 21:44:01 2005 UTC

#	Line 265 | Line 265 | public class TreeSet<E>
265		if (m.size()==0 && c.size() > 0 &&
266		c instanceof SortedSet &&
267		m instanceof TreeMap) {
268	<	SortedSet<Map.Entry<E, Object>> set = (SortedSet<Map.Entry<E, Object>>) (SortedSet) c;
268	>	SortedSet<? extends E> set = (SortedSet<? extends E>) c;
269		TreeMap<E,Object> map = (TreeMap<E, Object>) m;
270	<	Comparator<? super E> cc = (Comparator<E>) set.comparator();
270	>	Comparator<? super E> cc = (Comparator<? super E>) set.comparator();
271		Comparator<? super E> mc = map.comparator();
272		if (cc==mc || (cc != null && cc.equals(mc))) {
273		map.addAllForTreeSet(set, PRESENT);
#	Line 652 | Line 652 | public class TreeSet<E>
652		s.defaultReadObject();
653
654		// Read in Comparator
655	<	Comparator<E> c = (Comparator<E>) s.readObject();
655	>	Comparator<? super E> c = (Comparator<? super E>) s.readObject();
656
657		// Create backing TreeMap
658		TreeMap<E,Object> tm;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines