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.96 by jsr166, Thu May 2 06:02:17 2013 UTC vs.
Revision 1.100 by jsr166, Fri Aug 29 21:42:37 2014 UTC

#	Line 65 | Line 65 | import java.util.stream.Stream;
65		* java.util.concurrent.PriorityBlockingQueue} class.
66		*
67		* <p>Implementation note: this implementation provides
68	<	* O(log(n)) time for the enqueing and dequeing methods
68	>	* O(log(n)) time for the enqueuing and dequeuing methods
69		* ({@code offer}, {@code poll}, {@code remove()} and {@code add});
70		* linear time for the {@code remove(Object)} and {@code contains(Object)}
71		* methods; and constant time for the retrieval methods
#	Line 99 | Line 99 | public class PriorityQueue<E> extends Ab
99		/**
100		* The number of elements in the priority queue.
101		*/
102	<	private int size = 0;
102	>	private int size;
103
104		/**
105		* The comparator, or null if priority queue uses elements'
#	Line 393 | Line 393 | public class PriorityQueue<E> extends Ab
393		* @return {@code true} if this queue contains the specified element
394		*/
395		public boolean contains(Object o) {
396	<	return indexOf(o) != -1;
396	>	return indexOf(o) >= 0;
397		}
398
399		/**
#	Line 476 | Line 476 | public class PriorityQueue<E> extends Ab
476		* Index (into queue array) of element to be returned by
477		* subsequent call to next.
478		*/
479	<	private int cursor = 0;
479	>	private int cursor;
480
481		/**
482		* Index of element returned by most recent call to next,
#	Line 496 | Line 496 | public class PriorityQueue<E> extends Ab
496		* We expect that most iterations, even those involving removals,
497		* will not need to store elements in this field.
498		*/
499	<	private ArrayDeque<E> forgetMeNot = null;
499	>	private ArrayDeque<E> forgetMeNot;
500
501		/**
502		* Element returned by the most recent call to next iff that
503		* element was drawn from the forgetMeNot list.
504		*/
505	<	private E lastRetElt = null;
505	>	private E lastRetElt;
506
507		/**
508		* The modCount value that the iterator believes that the backing
#	Line 743 | Line 743 | public class PriorityQueue<E> extends Ab
743		*             emitted (int), followed by all of its elements
744		*             (each an {@code Object}) in the proper order.
745		* @param s the stream
746	+	* @throws java.io.IOException if an I/O error occurs
747		*/
748		private void writeObject(java.io.ObjectOutputStream s)
749		throws java.io.IOException {
#	Line 762 | Line 763 | public class PriorityQueue<E> extends Ab
763		* (that is, deserializes it).
764		*
765		* @param s the stream
766	+	* @throws ClassNotFoundException if the class of a serialized object
767	+	*         could not be found
768	+	* @throws java.io.IOException if an I/O error occurs
769		*/
770		private void readObject(java.io.ObjectInputStream s)
771		throws java.io.IOException, ClassNotFoundException {

Diff Legend

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