< prev index next >

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

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

*** 58,69 **** Object value = super.get(key); if (value != null) { return value; } ! for(int i = 0; i < tables.length; i++) { ! UIDefaults table = tables[i]; value = (table != null) ? table.get(key) : null; if (value != null) { return value; } } --- 58,68 ---- Object value = super.get(key); if (value != null) { return value; } ! for (UIDefaults table : tables) { value = (table != null) ? table.get(key) : null; if (value != null) { return value; } }
*** 77,88 **** Object value = super.get(key,l); if (value != null) { return value; } ! for(int i = 0; i < tables.length; i++) { ! UIDefaults table = tables[i]; value = (table != null) ? table.get(key,l) : null; if (value != null) { return value; } } --- 76,86 ---- Object value = super.get(key,l); if (value != null) { return value; } ! for (UIDefaults table : tables) { value = (table != null) ? table.get(key,l) : null; if (value != null) { return value; } }
*** 99,117 **** public boolean isEmpty() { return size() == 0; } @Override ! public Enumeration keys() { return new MultiUIDefaultsEnumerator( MultiUIDefaultsEnumerator.Type.KEYS, entrySet()); } @Override ! public Enumeration elements() { return new MultiUIDefaultsEnumerator( MultiUIDefaultsEnumerator.Type.ELEMENTS, entrySet()); } --- 97,115 ---- public boolean isEmpty() { return size() == 0; } @Override ! public Enumeration<Object> keys() { return new MultiUIDefaultsEnumerator( MultiUIDefaultsEnumerator.Type.KEYS, entrySet()); } @Override ! public Enumeration<Object> elements() { return new MultiUIDefaultsEnumerator( MultiUIDefaultsEnumerator.Type.ELEMENTS, entrySet()); }
*** 134,144 **** } else { super.getUIError(msg); } } ! private static class MultiUIDefaultsEnumerator implements Enumeration { public static enum Type { KEYS, ELEMENTS }; private Iterator<Entry<Object, Object>> iterator; private Type type; --- 132,142 ---- } else { super.getUIError(msg); } } ! private static class MultiUIDefaultsEnumerator implements Enumeration<Object> { public static enum Type { KEYS, ELEMENTS }; private Iterator<Entry<Object, Object>> iterator; private Type type;
*** 181,192 **** } @Override public void clear() { super.clear(); ! for(int i = 0; i < tables.length; i++) { ! UIDefaults table = tables[i]; if (table != null) { table.clear(); } } } --- 179,189 ---- } @Override public void clear() { super.clear(); ! for (UIDefaults table : tables) { if (table != null) { table.clear(); } } }
< prev index next >