Index: src/main/java/java/util/EnumSet.java =================================================================== --- src/main/java/java/util/EnumSet.java (revision 598271) +++ src/main/java/java/util/EnumSet.java (working copy) @@ -22,10 +22,10 @@ private static final long serialVersionUID = 4782406773684236311L; - final Class elementClass; + final Class elementType; EnumSet(Class cls) { - elementClass = cls; + elementType = cls; } /** @@ -75,7 +75,7 @@ * if the specified enum set is null */ public static > EnumSet copyOf(EnumSet s) { - EnumSet set = EnumSet.noneOf(s.elementClass); + EnumSet set = EnumSet.noneOf(s.elementType); set.addAll(s); return set; } @@ -122,7 +122,7 @@ * if the specified enum set is null */ public static > EnumSet complementOf(EnumSet s) { - EnumSet set = EnumSet.noneOf(s.elementClass); + EnumSet set = EnumSet.noneOf(s.elementType); set.addAll(s); set.complement(); return set; @@ -306,7 +306,7 @@ @SuppressWarnings("unchecked") boolean isValidType(Class cls) { - return cls == elementClass || cls.getSuperclass() == elementClass; + return cls == elementType || cls.getSuperclass() == elementType; } private static class SerializationProxy> implements @@ -331,7 +331,7 @@ Object writeReplace() { SerializationProxy proxy = new SerializationProxy(); proxy.elements = toArray(new Enum[0]); - proxy.elementType = elementClass; + proxy.elementType = elementType; return proxy; } }