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.36 by dl, Sat Aug 30 11:40:04 2003 UTC vs.
Revision 1.38 by dl, Mon Sep 1 12:23:28 2003 UTC

# Line 1 | Line 1
1 < package java.util;
1 > /*
2 > * %W% %E%
3 > *
4 > * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
5 > * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
6 > */
7 >
8 > package java.util;
9  
10   /**
11   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 48 | Line 55
55   * <a href="{@docRoot}/../guide/collections/index.html">
56   * Java Collections Framework</a>.
57   * @since 1.5
58 + * @version %I%, %G%
59   * @author Josh Bloch
60   */
61   public class PriorityQueue<E> extends AbstractQueue<E>
# Line 462 | Line 470 | public class PriorityQueue<E> extends Ab
470                      cursor--;
471                  } else {
472                      if (forgetMeNot == null)
473 <                        forgetMeNot = new ArrayList();
473 >                        forgetMeNot = new ArrayList<E>();
474                      forgetMeNot.add(moved);
475                  }
476              } else if (lastRetElt != null) {
# Line 669 | Line 677 | public class PriorityQueue<E> extends Ab
677  
678          // Read in all elements in the proper order.
679          for (int i=0; i<size; i++)
680 <            queue[i] = s.readObject();
680 >            queue[i] = (E) s.readObject();
681      }
682  
683   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines