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.65 by jsr166, Sun May 28 23:36:29 2006 UTC vs.
Revision 1.68 by jsr166, Sun May 18 23:47:56 2008 UTC

# Line 1 | Line 1
1   /*
2 < * %W% %E%
2 > * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
3 > * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5 < * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
6 < * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
5 > * This code is free software; you can redistribute it and/or modify it
6 > * under the terms of the GNU General Public License version 2 only, as
7 > * published by the Free Software Foundation.  Sun designates this
8 > * particular file as subject to the "Classpath" exception as provided
9 > * by Sun in the LICENSE file that accompanied this code.
10 > *
11 > * This code is distributed in the hope that it will be useful, but WITHOUT
12 > * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 > * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14 > * version 2 for more details (a copy is included in the LICENSE file that
15 > * accompanied this code).
16 > *
17 > * You should have received a copy of the GNU General Public License version
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.
24   */
25  
26   package java.util;
# Line 226 | Line 244 | public class PriorityQueue<E> extends Ab
244      private void grow(int minCapacity) {
245          if (minCapacity < 0) // overflow
246              throw new OutOfMemoryError();
247 <        int oldCapacity = queue.length;
247 >        int oldCapacity = queue.length;
248          // Double size if small; else grow by 50%
249          int newCapacity = ((oldCapacity < 64)?
250                             ((oldCapacity + 1) * 2):
# Line 282 | Line 300 | public class PriorityQueue<E> extends Ab
300      }
301  
302      private int indexOf(Object o) {
303 <        if (o != null) {
303 >        if (o != null) {
304              for (int i = 0; i < size; i++)
305                  if (o.equals(queue[i]))
306                      return i;
# Line 302 | Line 320 | public class PriorityQueue<E> extends Ab
320       * @return {@code true} if this queue changed as a result of the call
321       */
322      public boolean remove(Object o) {
323 <        int i = indexOf(o);
324 <        if (i == -1)
325 <            return false;
326 <        else {
327 <            removeAt(i);
328 <            return true;
329 <        }
323 >        int i = indexOf(o);
324 >        if (i == -1)
325 >            return false;
326 >        else {
327 >            removeAt(i);
328 >            return true;
329 >        }
330      }
331  
332      /**
# Line 319 | Line 337 | public class PriorityQueue<E> extends Ab
337       * @return {@code true} if removed
338       */
339      boolean removeEq(Object o) {
340 <        for (int i = 0; i < size; i++) {
341 <            if (o == queue[i]) {
340 >        for (int i = 0; i < size; i++) {
341 >            if (o == queue[i]) {
342                  removeAt(i);
343                  return true;
344              }
# Line 337 | Line 355 | public class PriorityQueue<E> extends Ab
355       * @return {@code true} if this queue contains the specified element
356       */
357      public boolean contains(Object o) {
358 <        return indexOf(o) != -1;
358 >        return indexOf(o) != -1;
359      }
360  
361      /**
# Line 398 | Line 416 | public class PriorityQueue<E> extends Ab
416          if (a.length < size)
417              // Make a new array of a's runtime type, but my contents:
418              return (T[]) Arrays.copyOf(queue, size, a.getClass());
419 <        System.arraycopy(queue, 0, a, 0, size);
419 >        System.arraycopy(queue, 0, a, 0, size);
420          if (a.length > size)
421              a[size] = null;
422          return a;
# Line 491 | Line 509 | public class PriorityQueue<E> extends Ab
509                  lastRetElt = null;
510              } else {
511                  throw new IllegalStateException();
512 <            }
512 >            }
513              expectedModCount = modCount;
514          }
515      }
# Line 707 | Line 725 | public class PriorityQueue<E> extends Ab
725          // Read in (and discard) array length
726          s.readInt();
727  
728 <        queue = new Object[size];
728 >        queue = new Object[size];
729  
730          // Read in all elements.
731          for (int i = 0; i < size; i++)
732              queue[i] = s.readObject();
733  
734 <        // Elements are guaranteed to be in "proper order", but the
735 <        // spec has never explained what that might be.
736 <        heapify();
734 >        // Elements are guaranteed to be in "proper order", but the
735 >        // spec has never explained what that might be.
736 >        heapify();
737      }
738   }

Diff Legend

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