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.70 by jsr166, Mon May 10 20:11:01 2010 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 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>.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines