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.70 by jsr166, Mon May 10 20:11:01 2010 UTC vs.
Revision 1.76 by jsr166, Fri Dec 2 14:37:32 2011 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
2	>	* Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 18 | Line 18
18		* 2 along with this work; if not, write to the Free Software Foundation,
19		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20		*
21	<	* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
22	<	* CA 95054 USA or visit www.sun.com if you need additional information or
23	<	* have any questions.
21	>	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22	>	* or visit www.oracle.com if you need additional information or have any
23	>	* questions.
24		*/
25
26		package java.util;
#	Line 77 | Line 77 | package java.util;
77		* @author Josh Bloch, Doug Lea
78		* @param <E> the type of elements held in this collection
79		*/
80	+	@SuppressWarnings("unchecked")
81		public class PriorityQueue<E> extends AbstractQueue<E>
82		implements java.io.Serializable {
83
#	Line 331 | Line 332 | public class PriorityQueue<E> extends Ab
332		}
333
334		public E peek() {
335	<	if (size == 0)
335	<	return null;
336	<	return (E) queue[0];
335	>	return (size == 0) ? null : (E) queue[0];
336		}
337
338		private int indexOf(Object o) {
#	Line 434 | Line 433 | public class PriorityQueue<E> extends Ab
433		* The following code can be used to dump the queue into a newly
434		* allocated array of <tt>String</tt>:
435		*
436	<	* <pre>
438	<	*     String[] y = x.toArray(new String[0]);</pre>
436	>	*  <pre> {@code String[] y = x.toArray(new String[0]);}</pre>
437		*
438		* Note that <tt>toArray(new Object[0])</tt> is identical in function to
439		* <tt>toArray()</tt>.
#	Line 592 | Line 590 | public class PriorityQueue<E> extends Ab
590		* avoid missing traversing elements.
591		*/
592		private E removeAt(int i) {
593	<	assert i >= 0 && i < size;
593	>	// assert i >= 0 && i < size;
594		modCount++;
595		int s = --size;
596		if (s == i) // removed last element
#	Line 736 | Line 734 | public class PriorityQueue<E> extends Ab
734		* @param s the stream
735		*/
736		private void writeObject(java.io.ObjectOutputStream s)
737	<	throws java.io.IOException{
737	>	throws java.io.IOException {
738		// Write out element count, and any hidden stuff
739		s.defaultWriteObject();
740

Diff Legend

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