ViewVC Help

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

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

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.71 by jsr166, Sun Sep 5 21:32:19 2010 UTC vs.
Revision 1.75 by jsr166, Tue Oct 25 20:29:12 2011 UTC

#	Line 331 | Line 331 | public class PriorityQueue<E> extends Ab
331		}
332
333		public E peek() {
334	<	if (size == 0)
335	<	return null;
336	<	return (E) queue[0];
334	>	return (size == 0) ? null : (E) queue[0];
335		}
336
337		private int indexOf(Object o) {
#	Line 434 | Line 432 | public class PriorityQueue<E> extends Ab
432		* The following code can be used to dump the queue into a newly
433		* allocated array of <tt>String</tt>:
434		*
435	<	* <pre>
438	<	*     String[] y = x.toArray(new String[0]);</pre>
435	>	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
436		*
437		* Note that <tt>toArray(new Object[0])</tt> is identical in function to
438		* <tt>toArray()</tt>.
#	Line 592 | Line 589 | public class PriorityQueue<E> extends Ab
589		* avoid missing traversing elements.
590		*/
591		private E removeAt(int i) {
592	<	assert i >= 0 && i < size;
592	>	// assert i >= 0 && i < size;
593		modCount++;
594		int s = --size;
595		if (s == i) // removed last element
#	Line 736 | Line 733 | public class PriorityQueue<E> extends Ab
733		* @param s the stream
734		*/
735		private void writeObject(java.io.ObjectOutputStream s)
736	<	throws java.io.IOException{
736	>	throws java.io.IOException {
737		// Write out element count, and any hidden stuff
738		s.defaultWriteObject();
739

Diff Legend

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