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

Comparing jsr166/src/main/java/util/Collections.java (file contents):
Revision 1.35 by jsr166, Tue Sep 1 01:43:43 2009 UTC vs.
Revision 1.39 by jsr166, Sun Sep 5 21:32:19 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
2 > * Copyright (c) 1997, 2007, 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 124 | Line 124 | public class Collections {
124       *
125       * <p>The implementation takes equal advantage of ascending and
126       * descending order in its input array, and can take advantage of
127 <     * ascending and descending order in different parts of the the same
127 >     * ascending and descending order in different parts of the same
128       * input array.  It is well-suited to merging two or more sorted arrays:
129       * simply concatenate the arrays and sort the resulting array.
130       *
# Line 184 | Line 184 | public class Collections {
184       *
185       * <p>The implementation takes equal advantage of ascending and
186       * descending order in its input array, and can take advantage of
187 <     * ascending and descending order in different parts of the the same
187 >     * ascending and descending order in different parts of the same
188       * input array.  It is well-suited to merging two or more sorted arrays:
189       * simply concatenate the arrays and sort the resulting array.
190       *
# Line 823 | Line 823 | public class Collections {
823                      i -= size;
824                  displaced = list.set(i, displaced);
825                  nMoved ++;
826 <            } while(i != cycleStart);
826 >            } while (i != cycleStart);
827          }
828      }
829  
# Line 1452 | Line 1452 | public class Collections {
1452               * when o is a Map.Entry, and calls o.setValue.
1453               */
1454              public boolean containsAll(Collection<?> coll) {
1455 <                Iterator<?> e = coll.iterator();
1456 <                while (e.hasNext())
1457 <                    if (!contains(e.next())) // Invokes safe contains() above
1455 >                Iterator<?> it = coll.iterator();
1456 >                while (it.hasNext())
1457 >                    if (!contains(it.next())) // Invokes safe contains() above
1458                          return false;
1459                  return true;
1460              }

Diff Legend

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