--- jsr166/src/main/java/util/Collections.java 2006/04/20 07:24:42 1.24 +++ jsr166/src/main/java/util/Collections.java 2006/05/28 23:36:29 1.28 @@ -38,7 +38,7 @@ import java.lang.reflect.Array; * already sorted may or may not throw UnsupportedOperationException. * *
This class is a member of the - * + * * Java Collections Framework. * * @author Josh Bloch @@ -168,13 +168,13 @@ public class Collections { /** * Searches the specified list for the specified object using the binary * search algorithm. The list must be sorted into ascending order - * according to the natural ordering of its elements (as by the - * sort(List) method, above) prior to making this call. If it is - * not sorted, the results are undefined. If the list contains multiple - * elements equal to the specified object, there is no guarantee which one - * will be found.
+ * according to the {@linkplain Comparable natural ordering} of its + * elements (as by the {@link #sort(List)} method) prior to making this + * call. If it is not sorted, the results are undefined. If the list + * contains multiple elements equal to the specified object, there is no + * guarantee which one will be found. * - * This method runs in log(n) time for a "random access" list (which + *
This method runs in log(n) time for a "random access" list (which
* provides near-constant-time positional access). If the specified list
* does not implement the {@link RandomAccess} interface and is large,
* this method will do an iterator-based binary search that performs
@@ -186,16 +186,14 @@ public class Collections {
* otherwise, (-(insertion point) - 1). The
* insertion point is defined as the point at which the
* key would be inserted into the list: the index of the first
- * element greater than the key, or list.size(), if all
+ * element greater than the key, or list.size() if all
* elements in the list are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
* @throws ClassCastException if the list contains elements that are not
* mutually comparable (for example, strings and
- * integers), or the search key in not mutually comparable
+ * integers), or the search key is not mutually comparable
* with the elements of the list.
- * @see Comparable
- * @see #sort(List)
*/
public static
+ * will be found.
*
- * This method runs in log(n) time for a "random access" list (which
+ * This method runs in log(n) time for a "random access" list (which
* provides near-constant-time positional access). If the specified list
* does not implement the {@link RandomAccess} interface and is large,
* this method will do an iterator-based binary search that performs
@@ -284,23 +283,21 @@ public class Collections {
*
* @param list the list to be searched.
* @param key the key to be searched for.
- * @param c the comparator by which the list is ordered. A
- * null value indicates that the elements' natural
- * ordering should be used.
+ * @param c the comparator by which the list is ordered.
+ * A null value indicates that the elements'
+ * {@linkplain Comparable natural ordering} should be used.
* @return the index of the search key, if it is contained in the list;
* otherwise, (-(insertion point) - 1). The
* insertion point is defined as the point at which the
* key would be inserted into the list: the index of the first
- * element greater than the key, or list.size(), if all
+ * element greater than the key, or list.size() if all
* elements in the list are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
* @throws ClassCastException if the list contains elements that are not
* mutually comparable using the specified comparator,
- * or the search key in not mutually comparable with the
+ * or the search key is not mutually comparable with the
* elements of the list using this comparator.
- * @see Comparable
- * @see #sort(List, Comparator)
*/
public static