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.115 by jsr166, Fri Dec 2 07:11:36 2016 UTC vs.
Revision 1.121 by jsr166, Wed Mar 28 02:50:41 2018 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 2003, 2018, 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 26 | Line 26
26		package java.util;
27
28		import java.util.function.Consumer;
29	+	import jdk.internal.misc.SharedSecrets;
30
31		/**
32		* An unbounded priority {@linkplain Queue queue} based on a priority heap.
#	Line 73 | Line 74 | import java.util.function.Consumer;
74		* ({@code peek}, {@code element}, and {@code size}).
75		*
76		* <p>This class is a member of the
77	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
77	>	* <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
78		* Java Collections Framework</a>.
79		*
80		* @since 1.5
#	Line 522 | Line 523 | public class PriorityQueue<E> extends Ab
523		*/
524		private int expectedModCount = modCount;
525
526	+	Itr() {}                        // prevent access constructor creation
527	+
528		public boolean hasNext() {
529		return cursor < size ||
530		(forgetMeNot != null && !forgetMeNot.isEmpty());
#	Line 631 | Line 634 | public class PriorityQueue<E> extends Ab
634		* promoting x up the tree until it is greater than or equal to
635		* its parent, or is the root.
636		*
637	<	* To simplify and speed up coercions and comparisons. the
637	>	* To simplify and speed up coercions and comparisons, the
638		* Comparable and Comparator versions are separated into different
639		* methods that are otherwise identical. (Similarly for siftDown.)
640		*
#	Line 732 | Line 735 | public class PriorityQueue<E> extends Ab
735		@SuppressWarnings("unchecked")
736		private void heapify() {
737		final Object[] es = queue;
738	<	final int half = (size >>> 1) - 1;
738	>	int i = (size >>> 1) - 1;
739		if (comparator == null)
740	<	for (int i = half; i >= 0; i--)
740	>	for (; i >= 0; i--)
741		siftDownComparable(i, (E) es[i]);
742		else
743	<	for (int i = half; i >= 0; i--)
743	>	for (; i >= 0; i--)
744		siftDownUsingComparator(i, (E) es[i]);
745		}
746
#	Line 793 | Line 796 | public class PriorityQueue<E> extends Ab
796		// Read in (and discard) array length
797		s.readInt();
798
799	+	SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
800		queue = new Object[size];
801
802		// Read in all elements.

Diff Legend

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