src/share/classes/javax/swing/MultiUIDefaults.java

rev 1527 : 6727662: Code improvement and warnings removing from swing packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: malenkov

@@ -58,12 +58,11 @@
         Object value = super.get(key);
         if (value != null) {
             return value;
         }
 
-        for(int i = 0; i < tables.length; i++) {
-            UIDefaults table = tables[i];
+        for (UIDefaults table : tables) {
             value = (table != null) ? table.get(key) : null;
             if (value != null) {
                 return value;
             }
         }

@@ -77,12 +76,11 @@
         Object value = super.get(key,l);
         if (value != null) {
             return value;
         }
 
-        for(int i = 0; i < tables.length; i++) {
-            UIDefaults table = tables[i];
+        for (UIDefaults table : tables) {
             value = (table != null) ? table.get(key,l) : null;
             if (value != null) {
                 return value;
             }
         }

@@ -99,19 +97,19 @@
     public boolean isEmpty() {
         return size() == 0;
     }
 
     @Override
-    public Enumeration keys()
+    public Enumeration<Object> keys()
     {
         return new MultiUIDefaultsEnumerator(
                 MultiUIDefaultsEnumerator.Type.KEYS, entrySet());
     }
 
 
     @Override
-    public Enumeration elements()
+    public Enumeration<Object> elements()
     {
         return new MultiUIDefaultsEnumerator(
                 MultiUIDefaultsEnumerator.Type.ELEMENTS, entrySet());
     }
 

@@ -134,11 +132,11 @@
         } else {
             super.getUIError(msg);
         }
     }
 
-    private static class MultiUIDefaultsEnumerator implements Enumeration
+    private static class MultiUIDefaultsEnumerator implements Enumeration<Object>
     {
         public static enum Type { KEYS, ELEMENTS };
         private Iterator<Entry<Object, Object>> iterator;
         private Type type;
 

@@ -181,12 +179,11 @@
     }
 
     @Override
     public void clear() {
         super.clear();
-        for(int i = 0; i < tables.length; i++) {
-            UIDefaults table = tables[i];
+        for (UIDefaults table : tables) {
             if (table != null) {
                 table.clear();
             }
         }
     }