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.15 by jsr166, Thu Aug 25 04:37:12 2005 UTC vs.
Revision 1.20 by jsr166, Wed Jan 11 00:57:12 2006 UTC

# Line 1 | Line 1
1   /*
2   * %W% %E%
3   *
4 < * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
4 > * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
5   * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
6   */
7  
# Line 2221 | Line 2221 | public class Collections {
2221          public Object[] toArray()           { return c.toArray(); }
2222          public <T> T[] toArray(T[] a)       { return c.toArray(a); }
2223          public String toString()            { return c.toString(); }
2224        public Iterator<E> iterator()       { return c.iterator(); }
2224          public boolean remove(Object o)     { return c.remove(o); }
2225          public boolean containsAll(Collection<?> coll) {
2226              return c.containsAll(coll);
# Line 2236 | Line 2235 | public class Collections {
2235              c.clear();
2236          }
2237  
2238 <        public boolean add(E e){
2238 >        public Iterator<E> iterator() {
2239 >            return new Iterator<E>() {
2240 >                private final Iterator<E> it = c.iterator();
2241 >                public boolean hasNext() { return it.hasNext(); }
2242 >                public E next()          { return it.next(); }
2243 >                public void remove()     {        it.remove(); }};
2244 >        }
2245 >
2246 >        public boolean add(E e){
2247              typeCheck(e);
2248              return c.add(e);
2249          }
# Line 3498 | Line 3505 | public class Collections {
3505       * </pre>
3506       *
3507       * @param c the collection into which <tt>elements</tt> are to be inserted
3508 <     * @param a the elements to insert into <tt>c</tt>
3508 >     * @param elements the elements to insert into <tt>c</tt>
3509       * @return <tt>true</tt> if the collection changed as a result of the call
3510       * @throws UnsupportedOperationException if <tt>c</tt> does not support
3511 <     *         the <tt>add</tt> operation.
3511 >     *         the <tt>add</tt> operation
3512       * @throws NullPointerException if <tt>elements</tt> contains one or more
3513       *         null values and <tt>c</tt> does not permit null elements, or
3514       *         if <tt>c</tt> or <tt>elements</tt> are <tt>null</tt>
# Line 3510 | Line 3517 | public class Collections {
3517       * @see Collection#addAll(Collection)
3518       * @since 1.5
3519       */
3520 <    public static <T> boolean addAll(Collection<? super T> c, T... a) {
3520 >    public static <T> boolean addAll(Collection<? super T> c, T... elements) {
3521          boolean result = false;
3522 <        for (T e : a)
3523 <            result |= c.add(e);
3522 >        for (T element : elements)
3523 >            result |= c.add(element);
3524          return result;
3525      }
3526  
# Line 3553 | Line 3560 | public class Collections {
3560      private static class SetFromMap<E> extends AbstractSet<E>
3561          implements Set<E>, Serializable
3562      {
3556        static final long serialVersionUID = 2454657854757543876L;
3563          private final Map<E, Boolean> m;  // The backing map
3564          private transient Set<E> keySet;  // Its keySet
3565  
# Line 3601 | Line 3607 | public class Collections {
3607       * <tt>remove</tt> is mapped to <tt>pop</tt> and so on. This
3608       * view can be useful when you would like to use a method
3609       * requiring a <tt>Queue</tt> but you need Lifo ordering.
3610 +     *
3611       * @param deque the deque
3612       * @return the queue
3613       * @since  1.6
# Line 3614 | Line 3621 | public class Collections {
3621          private static final long serialVersionUID = 1802017725587941708L;
3622          private final Deque<E> q;
3623          AsLIFOQueue(Deque<E> q)            { this.q = q; }
3624 +        public boolean add(E e)            { q.addFirst(e); return true; }
3625          public boolean offer(E e)          { return q.offerFirst(e); }
3626          public E poll()                    { return q.pollFirst(); }
3627          public E remove()                  { return q.removeFirst(); }
# Line 3625 | Line 3633 | public class Collections {
3633          public Iterator<E> iterator()      { return q.iterator(); }
3634          public Object[] toArray()          { return q.toArray(); }
3635          public <T> T[] toArray(T[] a)      { return q.toArray(a); }
3628        public boolean add(E e)            { return q.offerFirst(e); }
3636          public boolean remove(Object o)    { return q.remove(o); }
3637          public void clear()                { q.clear(); }
3638      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines