diff -r f3678823f231 -r ec84f0c313b0 jdk/src/share/classes/java/util/EnumSet.java --- a/jdk/src/share/classes/java/util/EnumSet.java Mon Jul 15 13:42:35 2013 +0100 +++ b/jdk/src/share/classes/java/util/EnumSet.java Mon Jul 15 14:37:01 2013 -0700 @@ -100,8 +100,10 @@ /** * Creates an empty enum set with the specified element type. * + * @param The class of the elements in the set * @param elementType the class object of the element type for this enum * set + * @return An empty enum set of the specified type. * @throws NullPointerException if elementType is null */ public static > EnumSet noneOf(Class elementType) { @@ -119,8 +121,10 @@ * Creates an enum set containing all of the elements in the specified * element type. * + * @param The class of the elements in the set * @param elementType the class object of the element type for this enum * set + * @return An enum set containing all the elements in the specified type. * @throws NullPointerException if elementType is null */ public static > EnumSet allOf(Class elementType) { @@ -139,7 +143,9 @@ * Creates an enum set with the same element type as the specified enum * set, initially containing the same elements (if any). * + * @param The class of the elements in the set * @param s the enum set from which to initialize this enum set + * @return A copy of the specified enum set. * @throws NullPointerException if s is null */ public static > EnumSet copyOf(EnumSet s) { @@ -153,7 +159,9 @@ * Otherwise, the specified collection must contain at least one element * (in order to determine the new enum set's element type). * + * @param The class of the elements in the collection * @param c the collection from which to initialize this enum set + * @return An enum set initialized from the given collection. * @throws IllegalArgumentException if c is not an * EnumSet instance and contains no elements * @throws NullPointerException if c is null @@ -178,7 +186,9 @@ * set, initially containing all the elements of this type that are * not contained in the specified set. * + * @param The class of the elements in the enum set * @param s the enum set from whose complement to initialize this enum set + * @return The complement of the specified set in this set * @throws NullPointerException if s is null */ public static > EnumSet complementOf(EnumSet s) { @@ -196,6 +206,7 @@ * an enum set initially containing an arbitrary number of elements, but * is likely to run slower than the overloadings that do not use varargs. * + * @param The class of the specified element and of the set * @param e the element that this set is to contain initially * @throws NullPointerException if e is null * @return an enum set initially containing the specified element @@ -215,6 +226,7 @@ * an enum set initially containing an arbitrary number of elements, but * is likely to run slower than the overloadings that do not use varargs. * + * @param The class of the parameter elements and of the set * @param e1 an element that this set is to contain initially * @param e2 another element that this set is to contain initially * @throws NullPointerException if any parameters are null @@ -236,6 +248,7 @@ * an enum set initially containing an arbitrary number of elements, but * is likely to run slower than the overloadings that do not use varargs. * + * @param The class of the parameter elements and of the set * @param e1 an element that this set is to contain initially * @param e2 another element that this set is to contain initially * @param e3 another element that this set is to contain initially @@ -259,6 +272,7 @@ * an enum set initially containing an arbitrary number of elements, but * is likely to run slower than the overloadings that do not use varargs. * + * @param The class of the parameter elements and of the set * @param e1 an element that this set is to contain initially * @param e2 another element that this set is to contain initially * @param e3 another element that this set is to contain initially @@ -284,6 +298,7 @@ * an enum set initially containing an arbitrary number of elements, but * is likely to run slower than the overloadings that do not use varargs. * + * @param The class of the parameter elements and of the set * @param e1 an element that this set is to contain initially * @param e2 another element that this set is to contain initially * @param e3 another element that this set is to contain initially @@ -311,6 +326,7 @@ * number of elements, but it is likely to run slower than the overloadings * that do not use varargs. * + * @param The class of the parameter elements and of the set * @param first an element that the set is to contain initially * @param rest the remaining elements the set is to contain initially * @throws NullPointerException if any of the specified elements are null, @@ -332,6 +348,7 @@ * contain the endpoints themselves, which may be identical but must not * be out of order. * + * @param The class of the parameter elements and of the set * @param from the first element in the range * @param to the last element in the range * @throws NullPointerException if {@code from} or {@code to} are null