ViewVC Help

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

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

Comparing jsr166/src/main/java/util/Collections.java (file contents):
Revision 1.35 by jsr166, Tue Sep 1 01:43:43 2009 UTC vs.
Revision 1.38 by jsr166, Wed Sep 1 20:12:39 2010 UTC

#	Line 124 | Line 124 | public class Collections {
124		*
125		* <p>The implementation takes equal advantage of ascending and
126		* descending order in its input array, and can take advantage of
127	<	* ascending and descending order in different parts of the the same
127	>	* ascending and descending order in different parts of the same
128		* input array.  It is well-suited to merging two or more sorted arrays:
129		* simply concatenate the arrays and sort the resulting array.
130		*
#	Line 184 | Line 184 | public class Collections {
184		*
185		* <p>The implementation takes equal advantage of ascending and
186		* descending order in its input array, and can take advantage of
187	<	* ascending and descending order in different parts of the the same
187	>	* ascending and descending order in different parts of the same
188		* input array.  It is well-suited to merging two or more sorted arrays:
189		* simply concatenate the arrays and sort the resulting array.
190		*
#	Line 823 | Line 823 | public class Collections {
823		i -= size;
824		displaced = list.set(i, displaced);
825		nMoved ++;
826	<	} while(i != cycleStart);
826	>	} while (i != cycleStart);
827		}
828		}
829
#	Line 1452 | Line 1452 | public class Collections {
1452		* when o is a Map.Entry, and calls o.setValue.
1453		*/
1454		public boolean containsAll(Collection<?> coll) {
1455	<	Iterator<?> e = coll.iterator();
1456	<	while (e.hasNext())
1457	<	if (!contains(e.next())) // Invokes safe contains() above
1455	>	Iterator<?> it = coll.iterator();
1456	>	while (it.hasNext())
1457	>	if (!contains(it.next())) // Invokes safe contains() above
1458		return false;
1459		return true;
1460		}

Diff Legend

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