src/share/classes/java/util/JumboEnumSet.java

rev 4788 : Fix bunch of generics warnings

@@ -44,11 +44,11 @@
     private long elements[];
 
     // Redundant - maintained for performance
     private int size = 0;
 
-    JumboEnumSet(Class<E>elementType, Enum[] universe) {
+    JumboEnumSet(Class<E>elementType, Enum<?>[] universe) {
         super(elementType, universe);
         elements = new long[(universe.length + 63) >>> 6];
     }
 
     void addRange(E from, E to) {

@@ -125,10 +125,11 @@
             while (unseen == 0 && unseenIndex < elements.length - 1)
                 unseen = elements[++unseenIndex];
             return unseen != 0;
         }
 
+        @Override
         public E next() {
             if (!hasNext())
                 throw new NoSuchElementException();
             lastReturned = unseen & -unseen;
             lastReturnedIndex = unseenIndex;

@@ -174,15 +175,15 @@
      * @return <tt>true</tt> if this set contains the specified element
      */
     public boolean contains(Object e) {
         if (e == null)
             return false;
-        Class eClass = e.getClass();
+        Class<?> eClass = e.getClass();
         if (eClass != elementType && eClass.getSuperclass() != elementType)
             return false;
 
-        int eOrdinal = ((Enum)e).ordinal();
+        int eOrdinal = ((Enum<?>)e).ordinal();
         return (elements[eOrdinal >>> 6] & (1L << eOrdinal)) != 0;
     }
 
     // Modification Operations
 

@@ -215,14 +216,14 @@
      * @return <tt>true</tt> if the set contained the specified element
      */
     public boolean remove(Object e) {
         if (e == null)
             return false;
-        Class eClass = e.getClass();
+        Class<?> eClass = e.getClass();
         if (eClass != elementType && eClass.getSuperclass() != elementType)
             return false;
-        int eOrdinal = ((Enum)e).ordinal();
+        int eOrdinal = ((Enum<?>)e).ordinal();
         int eWordNum = eOrdinal >>> 6;
 
         long oldElements = elements[eWordNum];
         elements[eWordNum] &= ~(1L << eOrdinal);
         boolean result = (elements[eWordNum] != oldElements);

@@ -244,11 +245,11 @@
      */
     public boolean containsAll(Collection<?> c) {
         if (!(c instanceof JumboEnumSet))
             return super.containsAll(c);
 
-        JumboEnumSet es = (JumboEnumSet)c;
+        JumboEnumSet<?> es = (JumboEnumSet<?>)c;
         if (es.elementType != elementType)
             return es.isEmpty();
 
         for (int i = 0; i < elements.length; i++)
             if ((es.elements[i] & ~elements[i]) != 0)

@@ -266,11 +267,11 @@
      */
     public boolean addAll(Collection<? extends E> c) {
         if (!(c instanceof JumboEnumSet))
             return super.addAll(c);
 
-        JumboEnumSet es = (JumboEnumSet)c;
+        JumboEnumSet<?> es = (JumboEnumSet<?>)c;
         if (es.elementType != elementType) {
             if (es.isEmpty())
                 return false;
             else
                 throw new ClassCastException(

@@ -292,11 +293,11 @@
      */
     public boolean removeAll(Collection<?> c) {
         if (!(c instanceof JumboEnumSet))
             return super.removeAll(c);
 
-        JumboEnumSet es = (JumboEnumSet)c;
+        JumboEnumSet<?> es = (JumboEnumSet<?>)c;
         if (es.elementType != elementType)
             return false;
 
         for (int i = 0; i < elements.length; i++)
             elements[i] &= ~es.elements[i];

@@ -346,11 +347,11 @@
      */
     public boolean equals(Object o) {
         if (!(o instanceof JumboEnumSet))
             return super.equals(o);
 
-        JumboEnumSet es = (JumboEnumSet)o;
+        JumboEnumSet<?> es = (JumboEnumSet<?>)o;
         if (es.elementType != elementType)
             return size == 0 && es.size == 0;
 
         return Arrays.equals(es.elements, elements);
     }