ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/PriorityQueue.java
(Generate patch)

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.69 by jsr166, Sun May 18 23:59:57 2008 UTC vs.
Revision 1.73 by jsr166, Tue Jun 21 19:29:21 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 170 | Line 170 | public class PriorityQueue<E> extends Ab
170       * @throws NullPointerException if the specified collection or any
171       *         of its elements are null
172       */
173 +    @SuppressWarnings("unchecked")
174      public PriorityQueue(Collection<? extends E> c) {
175 <        initFromCollection(c);
176 <        if (c instanceof SortedSet)
177 <            comparator = (Comparator<? super E>)
178 <                ((SortedSet<? extends E>)c).comparator();
179 <        else if (c instanceof PriorityQueue)
180 <            comparator = (Comparator<? super E>)
181 <                ((PriorityQueue<? extends E>)c).comparator();
175 >        if (c instanceof SortedSet<?>) {
176 >            SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
177 >            this.comparator = (Comparator<? super E>) ss.comparator();
178 >            initElementsFromCollection(ss);
179 >        }
180 >        else if (c instanceof PriorityQueue<?>) {
181 >            PriorityQueue<? extends E> pq = (PriorityQueue<? extends E>) c;
182 >            this.comparator = (Comparator<? super E>) pq.comparator();
183 >            initFromPriorityQueue(pq);
184 >        }
185          else {
186 <            comparator = null;
187 <            heapify();
186 >            this.comparator = null;
187 >            initFromCollection(c);
188          }
189      }
190  
# Line 198 | Line 202 | public class PriorityQueue<E> extends Ab
202       * @throws NullPointerException if the specified priority queue or any
203       *         of its elements are null
204       */
205 +    @SuppressWarnings("unchecked")
206      public PriorityQueue(PriorityQueue<? extends E> c) {
207 <        comparator = (Comparator<? super E>)c.comparator();
208 <        initFromCollection(c);
207 >        this.comparator = (Comparator<? super E>) c.comparator();
208 >        initFromPriorityQueue(c);
209      }
210  
211      /**
# Line 216 | Line 221 | public class PriorityQueue<E> extends Ab
221       * @throws NullPointerException if the specified sorted set or any
222       *         of its elements are null
223       */
224 +    @SuppressWarnings("unchecked")
225      public PriorityQueue(SortedSet<? extends E> c) {
226 <        comparator = (Comparator<? super E>)c.comparator();
227 <        initFromCollection(c);
226 >        this.comparator = (Comparator<? super E>) c.comparator();
227 >        initElementsFromCollection(c);
228 >    }
229 >
230 >    private void initFromPriorityQueue(PriorityQueue<? extends E> c) {
231 >        if (c.getClass() == PriorityQueue.class) {
232 >            this.queue = c.toArray();
233 >            this.size = c.size();
234 >        } else {
235 >            initFromCollection(c);
236 >        }
237 >    }
238 >
239 >    private void initElementsFromCollection(Collection<? extends E> c) {
240 >        Object[] a = c.toArray();
241 >        // If c.toArray incorrectly doesn't return Object[], copy it.
242 >        if (a.getClass() != Object[].class)
243 >            a = Arrays.copyOf(a, a.length, Object[].class);
244 >        int len = a.length;
245 >        if (len == 1 || this.comparator != null)
246 >            for (int i = 0; i < len; i++)
247 >                if (a[i] == null)
248 >                    throw new NullPointerException();
249 >        this.queue = a;
250 >        this.size = a.length;
251      }
252  
253      /**
# Line 227 | Line 256 | public class PriorityQueue<E> extends Ab
256       * @param c the collection
257       */
258      private void initFromCollection(Collection<? extends E> c) {
259 <        Object[] a = c.toArray();
260 <        // If c.toArray incorrectly doesn't return Object[], copy it.
232 <        if (a.getClass() != Object[].class)
233 <            a = Arrays.copyOf(a, a.length, Object[].class);
234 <        queue = a;
235 <        size = a.length;
259 >        initElementsFromCollection(c);
260 >        heapify();
261      }
262  
263      /**
264 +     * The maximum size of array to allocate.
265 +     * Some VMs reserve some header words in an array.
266 +     * Attempts to allocate larger arrays may result in
267 +     * OutOfMemoryError: Requested array size exceeds VM limit
268 +     */
269 +    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
270 +
271 +    /**
272       * Increases the capacity of the array.
273       *
274       * @param minCapacity the desired minimum capacity
275       */
276      private void grow(int minCapacity) {
244        if (minCapacity < 0) // overflow
245            throw new OutOfMemoryError();
277          int oldCapacity = queue.length;
278          // Double size if small; else grow by 50%
279 <        int newCapacity = ((oldCapacity < 64)?
280 <                           ((oldCapacity + 1) * 2):
281 <                           ((oldCapacity / 2) * 3));
282 <        if (newCapacity < 0) // overflow
283 <            newCapacity = Integer.MAX_VALUE;
284 <        if (newCapacity < minCapacity)
254 <            newCapacity = minCapacity;
279 >        int newCapacity = oldCapacity + ((oldCapacity < 64) ?
280 >                                         (oldCapacity + 2) :
281 >                                         (oldCapacity >> 1));
282 >        // overflow-conscious code
283 >        if (newCapacity - MAX_ARRAY_SIZE > 0)
284 >            newCapacity = hugeCapacity(minCapacity);
285          queue = Arrays.copyOf(queue, newCapacity);
286      }
287  
288 +    private static int hugeCapacity(int minCapacity) {
289 +        if (minCapacity < 0) // overflow
290 +            throw new OutOfMemoryError();
291 +        return (minCapacity > MAX_ARRAY_SIZE) ?
292 +            Integer.MAX_VALUE :
293 +            MAX_ARRAY_SIZE;
294 +    }
295 +
296      /**
297       * Inserts the specified element into this priority queue.
298       *
# Line 293 | Line 331 | public class PriorityQueue<E> extends Ab
331      }
332  
333      public E peek() {
334 <        if (size == 0)
297 <            return null;
298 <        return (E) queue[0];
334 >        return (size == 0) ? null : (E) queue[0];
335      }
336  
337      private int indexOf(Object o) {
# Line 396 | 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>
400 <     *     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>.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines