--- jsr166/src/main/java/util/Collections.java 2010/09/01 20:12:39 1.38 +++ jsr166/src/main/java/util/Collections.java 2010/09/20 20:23:52 1.41 @@ -1,5 +1,5 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package java.util; @@ -1562,7 +1562,7 @@ public class Collections { *
* Collection c = Collections.synchronizedCollection(myCollection); * ... - * synchronized(c) { + * synchronized (c) { * Iterator i = c.iterator(); // Must be in the synchronized block * while (i.hasNext()) * foo(i.next()); @@ -1611,19 +1611,19 @@ public class Collections { } public int size() { - synchronized(mutex) {return c.size();} + synchronized (mutex) {return c.size();} } public boolean isEmpty() { - synchronized(mutex) {return c.isEmpty();} + synchronized (mutex) {return c.isEmpty();} } public boolean contains(Object o) { - synchronized(mutex) {return c.contains(o);} + synchronized (mutex) {return c.contains(o);} } public Object[] toArray() { - synchronized(mutex) {return c.toArray();} + synchronized (mutex) {return c.toArray();} } publicT[] toArray(T[] a) { - synchronized(mutex) {return c.toArray(a);} + synchronized (mutex) {return c.toArray(a);} } public Iterator iterator() { @@ -1631,32 +1631,32 @@ public class Collections { } public boolean add(E e) { - synchronized(mutex) {return c.add(e);} + synchronized (mutex) {return c.add(e);} } public boolean remove(Object o) { - synchronized(mutex) {return c.remove(o);} + synchronized (mutex) {return c.remove(o);} } public boolean containsAll(Collection> coll) { - synchronized(mutex) {return c.containsAll(coll);} + synchronized (mutex) {return c.containsAll(coll);} } public boolean addAll(Collection extends E> coll) { - synchronized(mutex) {return c.addAll(coll);} + synchronized (mutex) {return c.addAll(coll);} } public boolean removeAll(Collection> coll) { - synchronized(mutex) {return c.removeAll(coll);} + synchronized (mutex) {return c.removeAll(coll);} } public boolean retainAll(Collection> coll) { - synchronized(mutex) {return c.retainAll(coll);} + synchronized (mutex) {return c.retainAll(coll);} } public void clear() { - synchronized(mutex) {c.clear();} + synchronized (mutex) {c.clear();} } public String toString() { - synchronized(mutex) {return c.toString();} + synchronized (mutex) {return c.toString();} } private void writeObject(ObjectOutputStream s) throws IOException { - synchronized(mutex) {s.defaultWriteObject();} + synchronized (mutex) {s.defaultWriteObject();} } } @@ -1671,7 +1671,7 @@ public class Collections { * * Set s = Collections.synchronizedSet(new HashSet()); * ... - * synchronized(s) { + * synchronized (s) { * Iterator i = s.iterator(); // Must be in the synchronized block * while (i.hasNext()) * foo(i.next()); @@ -1709,10 +1709,10 @@ public class Collections { } public boolean equals(Object o) { - synchronized(mutex) {return c.equals(o);} + synchronized (mutex) {return c.equals(o);} } public int hashCode() { - synchronized(mutex) {return c.hashCode();} + synchronized (mutex) {return c.hashCode();} } } @@ -1728,7 +1728,7 @@ public class Collections { ** SortedSet s = Collections.synchronizedSortedSet(new TreeSet()); * ... - * synchronized(s) { + * synchronized (s) { * Iterator i = s.iterator(); // Must be in the synchronized block * while (i.hasNext()) * foo(i.next()); @@ -1739,7 +1739,7 @@ public class Collections { * SortedSet s = Collections.synchronizedSortedSet(new TreeSet()); * SortedSet s2 = s.headSet(foo); * ... - * synchronized(s) { // Note: s, not s2!!! + * synchronized (s) { // Note: s, not s2!!! * Iterator i = s2.iterator(); // Must be in the synchronized block * while (i.hasNext()) * foo(i.next()); @@ -1778,31 +1778,31 @@ public class Collections { } public Comparator super E> comparator() { - synchronized(mutex) {return ss.comparator();} + synchronized (mutex) {return ss.comparator();} } public SortedSetsubSet(E fromElement, E toElement) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedSet ( ss.subSet(fromElement, toElement), mutex); } } public SortedSet headSet(E toElement) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedSet (ss.headSet(toElement), mutex); } } public SortedSet tailSet(E fromElement) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedSet (ss.tailSet(fromElement),mutex); } } public E first() { - synchronized(mutex) {return ss.first();} + synchronized (mutex) {return ss.first();} } public E last() { - synchronized(mutex) {return ss.last();} + synchronized (mutex) {return ss.last();} } } @@ -1817,7 +1817,7 @@ public class Collections { * * List list = Collections.synchronizedList(new ArrayList()); * ... - * synchronized(list) { + * synchronized (list) { * Iterator i = list.iterator(); // Must be in synchronized block * while (i.hasNext()) * foo(i.next()); @@ -1863,34 +1863,34 @@ public class Collections { } public boolean equals(Object o) { - synchronized(mutex) {return list.equals(o);} + synchronized (mutex) {return list.equals(o);} } public int hashCode() { - synchronized(mutex) {return list.hashCode();} + synchronized (mutex) {return list.hashCode();} } public E get(int index) { - synchronized(mutex) {return list.get(index);} + synchronized (mutex) {return list.get(index);} } public E set(int index, E element) { - synchronized(mutex) {return list.set(index, element);} + synchronized (mutex) {return list.set(index, element);} } public void add(int index, E element) { - synchronized(mutex) {list.add(index, element);} + synchronized (mutex) {list.add(index, element);} } public E remove(int index) { - synchronized(mutex) {return list.remove(index);} + synchronized (mutex) {return list.remove(index);} } public int indexOf(Object o) { - synchronized(mutex) {return list.indexOf(o);} + synchronized (mutex) {return list.indexOf(o);} } public int lastIndexOf(Object o) { - synchronized(mutex) {return list.lastIndexOf(o);} + synchronized (mutex) {return list.lastIndexOf(o);} } public boolean addAll(int index, Collection extends E> c) { - synchronized(mutex) {return list.addAll(index, c);} + synchronized (mutex) {return list.addAll(index, c);} } public ListIteratorlistIterator() { @@ -1902,7 +1902,7 @@ public class Collections { } public List subList(int fromIndex, int toIndex) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedList (list.subList(fromIndex, toIndex), mutex); } @@ -1943,7 +1943,7 @@ public class Collections { } public List subList(int fromIndex, int toIndex) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedRandomAccessList ( list.subList(fromIndex, toIndex), mutex); } @@ -1975,7 +1975,7 @@ public class Collections { * ... * Set s = m.keySet(); // Needn't be in synchronized block * ... - * synchronized(m) { // Synchronizing on m, not s! + * synchronized (m) { // Synchronizing on m, not s! * Iterator i = s.iterator(); // Must be in synchronized block * while (i.hasNext()) * foo(i.next()); @@ -2016,32 +2016,32 @@ public class Collections { } public int size() { - synchronized(mutex) {return m.size();} + synchronized (mutex) {return m.size();} } public boolean isEmpty() { - synchronized(mutex) {return m.isEmpty();} + synchronized (mutex) {return m.isEmpty();} } public boolean containsKey(Object key) { - synchronized(mutex) {return m.containsKey(key);} + synchronized (mutex) {return m.containsKey(key);} } public boolean containsValue(Object value) { - synchronized(mutex) {return m.containsValue(value);} + synchronized (mutex) {return m.containsValue(value);} } public V get(Object key) { - synchronized(mutex) {return m.get(key);} + synchronized (mutex) {return m.get(key);} } public V put(K key, V value) { - synchronized(mutex) {return m.put(key, value);} + synchronized (mutex) {return m.put(key, value);} } public V remove(Object key) { - synchronized(mutex) {return m.remove(key);} + synchronized (mutex) {return m.remove(key);} } public void putAll(Map extends K, ? extends V> map) { - synchronized(mutex) {m.putAll(map);} + synchronized (mutex) {m.putAll(map);} } public void clear() { - synchronized(mutex) {m.clear();} + synchronized (mutex) {m.clear();} } private transient Set keySet = null; @@ -2049,7 +2049,7 @@ public class Collections { private transient Collection values = null; public Set keySet() { - synchronized(mutex) { + synchronized (mutex) { if (keySet==null) keySet = new SynchronizedSet (m.keySet(), mutex); return keySet; @@ -2057,7 +2057,7 @@ public class Collections { } public Set > entrySet() { - synchronized(mutex) { + synchronized (mutex) { if (entrySet==null) entrySet = new SynchronizedSet >(m.entrySet(), mutex); return entrySet; @@ -2065,7 +2065,7 @@ public class Collections { } public Collection values() { - synchronized(mutex) { + synchronized (mutex) { if (values==null) values = new SynchronizedCollection (m.values(), mutex); return values; @@ -2073,16 +2073,16 @@ public class Collections { } public boolean equals(Object o) { - synchronized(mutex) {return m.equals(o);} + synchronized (mutex) {return m.equals(o);} } public int hashCode() { - synchronized(mutex) {return m.hashCode();} + synchronized (mutex) {return m.hashCode();} } public String toString() { - synchronized(mutex) {return m.toString();} + synchronized (mutex) {return m.toString();} } private void writeObject(ObjectOutputStream s) throws IOException { - synchronized(mutex) {s.defaultWriteObject();} + synchronized (mutex) {s.defaultWriteObject();} } } @@ -2101,7 +2101,7 @@ public class Collections { * ... * Set s = m.keySet(); // Needn't be in synchronized block * ... - * synchronized(m) { // Synchronizing on m, not s! + * synchronized (m) { // Synchronizing on m, not s! * Iterator i = s.iterator(); // Must be in synchronized block * while (i.hasNext()) * foo(i.next()); @@ -2114,7 +2114,7 @@ public class Collections { * ... * Set s2 = m2.keySet(); // Needn't be in synchronized block * ... - * synchronized(m) { // Synchronizing on m, not m2 or s2! + * synchronized (m) { // Synchronizing on m, not m2 or s2! * Iterator i = s.iterator(); // Must be in synchronized block * while (i.hasNext()) * foo(i.next()); @@ -2154,31 +2154,31 @@ public class Collections { } public Comparator super K> comparator() { - synchronized(mutex) {return sm.comparator();} + synchronized (mutex) {return sm.comparator();} } public SortedMap subMap(K fromKey, K toKey) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedMap ( sm.subMap(fromKey, toKey), mutex); } } public SortedMap headMap(K toKey) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedMap (sm.headMap(toKey), mutex); } } public SortedMap tailMap(K fromKey) { - synchronized(mutex) { + synchronized (mutex) { return new SynchronizedSortedMap (sm.tailMap(fromKey),mutex); } } public K firstKey() { - synchronized(mutex) {return sm.firstKey();} + synchronized (mutex) {return sm.firstKey();} } public K lastKey() { - synchronized(mutex) {return sm.lastKey();} + synchronized (mutex) {return sm.lastKey();} } } @@ -3448,7 +3448,7 @@ public class Collections { * @param o the element to appear repeatedly in the returned list. * @return an immutable list consisting of n copies of the * specified object. - * @throws IllegalArgumentException if n < 0. + * @throws IllegalArgumentException if {@code n < 0} * @see List#addAll(Collection) * @see List#addAll(int, Collection) */