Index: src/main/java/common/java/awt/AWTEvent.java =================================================================== --- src/main/java/common/java/awt/AWTEvent.java (revision 443362) +++ src/main/java/common/java/awt/AWTEvent.java (working copy) @@ -21,6 +21,7 @@ import java.util.EventObject; import java.util.Hashtable; +import java.util.EventListener; import java.awt.event.*; @@ -266,9 +267,9 @@ final long eventMask; - final Class listenerType; + final Class listenerType; - EventDescriptor(long eventMask, Class listenerType) { + EventDescriptor(long eventMask, Class listenerType) { this.eventMask = eventMask; this.listenerType = listenerType; } Index: src/main/java/common/java/awt/AWTEventMulticaster.java =================================================================== --- src/main/java/common/java/awt/AWTEventMulticaster.java (revision 443362) +++ src/main/java/common/java/awt/AWTEventMulticaster.java (working copy) @@ -26,6 +26,7 @@ import java.util.EventListener; import java.util.LinkedList; +import java.lang.reflect.Array; public class AWTEventMulticaster implements ComponentListener, ContainerListener, FocusListener, KeyListener, @@ -65,16 +66,16 @@ s.writeObject(l); } - public static EventListener[] getListeners(EventListener l, Class listenerType) + public static T[] getListeners(EventListener l, Class listenerType) throws ClassCastException { if (l == null) { - return new EventListener[0]; + return (T[]) java.lang.reflect.Array.newInstance(listenerType, 0); } - return addListeners(l, listenerType, new LinkedList()).toArray( - (EventListener[]) java.lang.reflect.Array.newInstance(listenerType, 0)); + return addListeners(l, listenerType, new LinkedList()).toArray( + (T[]) java.lang.reflect.Array.newInstance(listenerType, 0)); } - private static LinkedList addListeners(EventListener l, Class listenerType, LinkedList list) { + private static LinkedList addListeners(EventListener l, Class listenerType, LinkedList list) { if (l instanceof AWTEventMulticaster) { AWTEventMulticaster ml = (AWTEventMulticaster) l; @@ -82,7 +83,7 @@ addListeners(ml.b, listenerType, list); } else { if (l.getClass().isAssignableFrom(listenerType)) { - list.add(l); + list.add((T)l); } } Index: src/main/java/common/java/awt/Button.java =================================================================== --- src/main/java/common/java/awt/Button.java (revision 443362) +++ src/main/java/common/java/awt/Button.java (working copy) @@ -226,9 +226,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ActionListener.class.isAssignableFrom(listenerType)) { - return getActionListeners(); + return (T[]) getActionListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/Checkbox.java =================================================================== --- src/main/java/common/java/awt/Checkbox.java (revision 443362) +++ src/main/java/common/java/awt/Checkbox.java (working copy) @@ -369,11 +369,11 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { toolkit.lockAWT(); try { if (ItemListener.class.isAssignableFrom(listenerType)) { - return getItemListeners(); + return (T[]) getItemListeners(); } return super.getListeners(listenerType); } finally { Index: src/main/java/common/java/awt/CheckboxMenuItem.java =================================================================== --- src/main/java/common/java/awt/CheckboxMenuItem.java (revision 443362) +++ src/main/java/common/java/awt/CheckboxMenuItem.java (working copy) @@ -178,9 +178,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ItemListener.class.isAssignableFrom(listenerType)) { - return getItemListeners(); + return (T[]) getItemListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/Choice.java =================================================================== --- src/main/java/common/java/awt/Choice.java (revision 443362) +++ src/main/java/common/java/awt/Choice.java (working copy) @@ -494,9 +494,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ItemListener.class.isAssignableFrom(listenerType)) { - return getItemListeners(); + return (T[]) getItemListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/Component.java =================================================================== --- src/main/java/common/java/awt/Component.java (revision 443362) +++ src/main/java/common/java/awt/Component.java (working copy) @@ -1854,12 +1854,12 @@ } } - public Set getFocusTraversalKeys(int id) { + public Set getFocusTraversalKeys(int id) { toolkit.lockAWT(); try { Integer kId = new Integer(id); KeyboardFocusManager.checkTraversalKeysID(traversalKeys, kId); - Set keys = null; + Set keys = null; Object value = traversalKeys.get(kId); keys = value instanceof Set ? (Set) value : parent != null ? parent.getFocusTraversalKeys(id) : null; @@ -3837,30 +3837,30 @@ } } - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ComponentListener.class.isAssignableFrom(listenerType)) { - return getComponentListeners(); + return (T[]) getComponentListeners(); } else if (FocusListener.class.isAssignableFrom(listenerType)) { - return getFocusListeners(); + return (T[]) getFocusListeners(); } else if (HierarchyBoundsListener.class.isAssignableFrom(listenerType)) { - return getHierarchyBoundsListeners(); + return (T[]) getHierarchyBoundsListeners(); } else if (HierarchyListener.class.isAssignableFrom(listenerType)) { - return getHierarchyListeners(); + return (T[]) getHierarchyListeners(); } else if (InputMethodListener.class.isAssignableFrom(listenerType)) { - return getInputMethodListeners(); + return (T[]) getInputMethodListeners(); } else if (KeyListener.class.isAssignableFrom(listenerType)) { - return getKeyListeners(); + return (T[]) getKeyListeners(); } else if (MouseWheelListener.class.isAssignableFrom(listenerType)) { - return getMouseWheelListeners(); + return (T[]) getMouseWheelListeners(); } else if (MouseMotionListener.class.isAssignableFrom(listenerType)) { - return getMouseMotionListeners(); + return (T[]) getMouseMotionListeners(); } else if (MouseListener.class.isAssignableFrom(listenerType)) { - return getMouseListeners(); + return (T[]) getMouseListeners(); } else if (PropertyChangeListener.class.isAssignableFrom(listenerType)) { - return getPropertyChangeListeners(); + return (T[]) getPropertyChangeListeners(); } - return new EventListener[0]; + return (T[]) java.lang.reflect.Array.newInstance(listenerType, 0); } private void processPaintEvent(PaintEvent event) { Index: src/main/java/common/java/awt/Container.java =================================================================== --- src/main/java/common/java/awt/Container.java (revision 443362) +++ src/main/java/common/java/awt/Container.java (working copy) @@ -646,7 +646,7 @@ } @Override - public Set getFocusTraversalKeys(int id) { + public Set getFocusTraversalKeys(int id) { toolkit.lockAWT(); try { return super.getFocusTraversalKeys(id); @@ -1033,7 +1033,7 @@ } @Override - public void setFocusTraversalKeys(int id, Set keystrokes) { + public void setFocusTraversalKeys(int id, Set keystrokes) { toolkit.lockAWT(); try { super.setFocusTraversalKeys(id, keystrokes); @@ -1258,11 +1258,11 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { // toolkit.lockAWT(); // try { if (ContainerListener.class.isAssignableFrom(listenerType)) { - return getContainerListeners(); + return (T[]) getContainerListeners(); } return super.getListeners(listenerType); // } finally { Index: src/main/java/common/java/awt/Font.java =================================================================== --- src/main/java/common/java/awt/Font.java (revision 443362) +++ src/main/java/common/java/awt/Font.java (working copy) @@ -525,8 +525,8 @@ } @SuppressWarnings("unchecked") - public Map getAttributes() { - return (Map)fRequestedAttributes.clone(); + public Map getAttributes() { + return (Map)fRequestedAttributes.clone(); } public Attribute[] getAvailableAttributes() { Index: src/main/java/common/java/awt/font/TextLayout.java =================================================================== --- src/main/java/common/java/awt/font/TextLayout.java (revision 443362) +++ src/main/java/common/java/awt/font/TextLayout.java (working copy) @@ -76,7 +76,11 @@ caretManager = new CaretManager(breaker); } - public TextLayout(String string, Map attributes, FontRenderContext frc) { + public TextLayout( + String string, + Map attributes, + FontRenderContext frc + ) { AttributedString as = new AttributedString(string); as.addAttributes(attributes, 0, string.length()); this.breaker = new TextRunBreaker(as.getIterator(), frc); Index: src/main/java/common/java/awt/Graphics2D.java =================================================================== --- src/main/java/common/java/awt/Graphics2D.java (revision 443362) +++ src/main/java/common/java/awt/Graphics2D.java (working copy) @@ -38,7 +38,7 @@ // Abstract methods - public abstract void addRenderingHints(Map hints); + public abstract void addRenderingHints(Map hints); public abstract void clip(Shape s); @@ -100,7 +100,7 @@ public abstract void setRenderingHint(RenderingHints.Key key, Object value); - public abstract void setRenderingHints(Map hints); + public abstract void setRenderingHints(Map hints); public abstract void setStroke(Stroke s); Index: src/main/java/common/java/awt/im/InputMethodHighlight.java =================================================================== --- src/main/java/common/java/awt/im/InputMethodHighlight.java (revision 443362) +++ src/main/java/common/java/awt/im/InputMethodHighlight.java (working copy) @@ -20,6 +20,7 @@ package java.awt.im; import java.util.Map; +import java.awt.font.TextAttribute; public class InputMethodHighlight { @@ -44,14 +45,14 @@ private boolean selected; private int state; private int variation; - private Map style; // Map + private Map style; public InputMethodHighlight(boolean selected, int state, int variation) { this(selected, state, variation, null); } public InputMethodHighlight(boolean selected, int state, - int variation, Map style) { + int variation, Map style) { if ((state != RAW_TEXT) && (state != CONVERTED_TEXT)) { throw new IllegalArgumentException("unknown input method" + " highlight state"); @@ -70,7 +71,7 @@ return state; } - public Map getStyle() { + public Map getStyle() { return style; } Index: src/main/java/common/java/awt/image/BufferedImage.java =================================================================== --- src/main/java/common/java/awt/image/BufferedImage.java (revision 443362) +++ src/main/java/common/java/awt/image/BufferedImage.java (working copy) @@ -110,7 +110,7 @@ private final ImageSurface imageSurf; public BufferedImage(ColorModel cm, WritableRaster raster, - boolean isRasterPremultiplied, Hashtable properties) { + boolean isRasterPremultiplied, Hashtable properties) { if (!cm.isCompatibleRaster(raster)) throw new IllegalArgumentException("The raster is" + " incompatible with this ColorModel"); @@ -121,6 +121,7 @@ this.cm = cm; this.raster = raster; + this.properties = properties; coerceData(isRasterPremultiplied); @@ -404,7 +405,7 @@ return outr; } - public Vector getSources() { + public Vector getSources() { return null; } Index: src/main/java/common/java/awt/image/ImageConsumer.java =================================================================== --- src/main/java/common/java/awt/image/ImageConsumer.java (revision 443362) +++ src/main/java/common/java/awt/image/ImageConsumer.java (working copy) @@ -41,7 +41,7 @@ public static final int IMAGEABORTED = 4; - public void setProperties(Hashtable props); + public void setProperties(Hashtable props); public void setColorModel(ColorModel model); Index: src/main/java/common/java/awt/image/MemoryImageSource.java =================================================================== --- src/main/java/common/java/awt/image/MemoryImageSource.java (revision 443362) +++ src/main/java/common/java/awt/image/MemoryImageSource.java (working copy) @@ -31,7 +31,7 @@ int iData[]; int offset; int scanline; - Hashtable properties; + Hashtable properties; Vector consumers; boolean animated; boolean fullbuffers; @@ -41,17 +41,17 @@ static final int DATA_TYPE_INT = 1; public MemoryImageSource(int w, int h, ColorModel cm, int pix[], - int off, int scan, Hashtable props) { + int off, int scan, Hashtable props) { init(w, h, cm, pix, off, scan, props); } public MemoryImageSource(int w, int h, ColorModel cm, byte pix[], - int off, int scan, Hashtable props) { + int off, int scan, Hashtable props) { init(w, h, cm, pix, off, scan, props); } public MemoryImageSource(int w, int h, int pix[], int off, int scan, - Hashtable props) { + Hashtable props) { init(w, h, ColorModel.getRGBdefault(), pix, off, scan, props); } Index: src/main/java/common/java/awt/image/renderable/ParameterBlock.java =================================================================== --- src/main/java/common/java/awt/image/renderable/ParameterBlock.java (revision 443362) +++ src/main/java/common/java/awt/image/renderable/ParameterBlock.java (working copy) @@ -28,16 +28,16 @@ private static final long serialVersionUID = -7577115551785240750L; - protected Vector sources = new Vector(); + protected Vector sources = new Vector(); - protected Vector parameters = new Vector(); + protected Vector parameters = new Vector(); - public ParameterBlock(Vector sources, Vector parameters) { + public ParameterBlock(Vector sources, Vector parameters) { setSources(sources); setParameters(parameters); } - public ParameterBlock(Vector sources) { + public ParameterBlock(Vector sources) { setSources(sources); } @@ -69,19 +69,19 @@ return this; } - public void setSources(Vector sources) { + public void setSources(Vector sources) { this.sources = sources; } - public void setParameters(Vector parameters) { + public void setParameters(Vector parameters) { this.parameters = parameters; } - public Vector getSources() { + public Vector getSources() { return sources; } - public Vector getParameters() { + public Vector getParameters() { return parameters; } @@ -109,10 +109,10 @@ return null; } if(sources != null){ - replica.setSources((Vector)(sources.clone())); + replica.setSources((Vector)(sources.clone())); } if(parameters != null){ - replica.setParameters((Vector)(parameters.clone())); + replica.setParameters((Vector)(parameters.clone())); } return replica; } Index: src/main/java/common/java/awt/image/renderable/RenderableImage.java =================================================================== --- src/main/java/common/java/awt/image/renderable/RenderableImage.java (revision 443362) +++ src/main/java/common/java/awt/image/renderable/RenderableImage.java (working copy) @@ -33,7 +33,7 @@ public RenderedImage createScaledRendering(int w, int h, RenderingHints hints); - public Vector getSources(); + public Vector getSources(); public String[] getPropertyNames(); Index: src/main/java/common/java/awt/image/renderable/RenderableImageOp.java =================================================================== --- src/main/java/common/java/awt/image/renderable/RenderableImageOp.java (revision 443362) +++ src/main/java/common/java/awt/image/renderable/RenderableImageOp.java (working copy) @@ -57,7 +57,7 @@ ParameterBlock rdParam = (ParameterBlock) paramBlock.clone(); if(sources != null){ - Vector rdSources = new Vector(); + Vector rdSources = new Vector(); int i = 0; while(i < sources.size()){ RenderContext newContext = CRIF.mapRenderContext(i, renderContext, @@ -94,14 +94,14 @@ return createRendering(context); } - public Vector getSources() { + public Vector getSources() { if(paramBlock.getNumSources() == 0) return null; - Vector v = new Vector(); + Vector v = new Vector(); int i = 0; while(i < paramBlock.getNumSources()){ Object o = paramBlock.getSource(i); if(o instanceof RenderableImage){ - v.addElement(o); + v.addElement((RenderableImage) o); } i++; } Index: src/main/java/common/java/awt/image/RenderedImage.java =================================================================== --- src/main/java/common/java/awt/image/RenderedImage.java (revision 443362) +++ src/main/java/common/java/awt/image/RenderedImage.java (working copy) @@ -30,7 +30,7 @@ public Raster getData(Rectangle rect); - public Vector getSources(); + public Vector getSources(); public String[] getPropertyNames(); Index: src/main/java/common/java/awt/KeyboardFocusManager.java =================================================================== --- src/main/java/common/java/awt/KeyboardFocusManager.java (revision 443362) +++ src/main/java/common/java/awt/KeyboardFocusManager.java (working copy) @@ -84,9 +84,9 @@ private static Window prevFocusedWindow; - final ListenerList keyEventDispatchers = new ListenerList(); + final ListenerList keyEventDispatchers = new ListenerList(); - final ListenerList keyEventPostProcessors = new ListenerList(); + final ListenerList keyEventPostProcessors = new ListenerList(); private PropertyChangeSupport propertyChangeSupport; @@ -202,7 +202,7 @@ } } - public Set getDefaultFocusTraversalKeys(int id) { + public Set getDefaultFocusTraversalKeys(int id) { Integer kId = Integer.valueOf(id); checkTraversalKeysID(defaultFocusTraversalKeys, kId); return defaultFocusTraversalKeys.get(kId); @@ -272,11 +272,11 @@ return permanentFocusOwner; } - protected List getKeyEventDispatchers() { + protected List getKeyEventDispatchers() { return keyEventDispatchers.getUserListeners(); } - protected List getKeyEventPostProcessors() { + protected List getKeyEventPostProcessors() { return keyEventPostProcessors.getUserListeners(); } @@ -367,13 +367,13 @@ newManager.firePropertyChange(propName, Boolean.FALSE, Boolean.TRUE); } - public void setDefaultFocusTraversalKeys(int id, Set keystrokes) { + public void setDefaultFocusTraversalKeys(int id, Set keystrokes) { Integer kId = Integer.valueOf(id); Set oldKeyStrokes = defaultFocusTraversalKeys.get(kId); checkTraversalKeysID(defaultFocusTraversalKeys, kId); checkKeyStrokes(contTraversalIDs, defaultFocusTraversalKeys, kId, - keystrokes); - defaultFocusTraversalKeys.put(kId, keystrokes); + (Set) keystrokes); + defaultFocusTraversalKeys.put(kId, (Set) keystrokes); String propName = null; switch (id) { case FORWARD_TRAVERSAL_KEYS: Index: src/main/java/common/java/awt/List.java =================================================================== --- src/main/java/common/java/awt/List.java (revision 443362) +++ src/main/java/common/java/awt/List.java (working copy) @@ -1332,11 +1332,11 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ActionListener.class.isAssignableFrom(listenerType)) { - return getActionListeners(); + return (T[]) getActionListeners(); } else if (ItemListener.class.isAssignableFrom(listenerType)) { - return getItemListeners(); + return (T[]) getItemListeners(); } else { return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/MenuItem.java =================================================================== --- src/main/java/common/java/awt/MenuItem.java (revision 443362) +++ src/main/java/common/java/awt/MenuItem.java (working copy) @@ -244,13 +244,13 @@ } } - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { toolkit.lockAWT(); try { if (ActionListener.class.isAssignableFrom(listenerType)) { - return getActionListeners(); + return (T[]) getActionListeners(); } - return new EventListener[0]; + return (T[]) java.lang.reflect.Array.newInstance(listenerType, 0); } finally { toolkit.unlockAWT(); } Index: src/main/java/common/java/awt/Scrollbar.java =================================================================== --- src/main/java/common/java/awt/Scrollbar.java (revision 443362) +++ src/main/java/common/java/awt/Scrollbar.java (working copy) @@ -577,9 +577,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (AdjustmentListener.class.isAssignableFrom(listenerType)) { - return getAdjustmentListeners(); + return (T[]) getAdjustmentListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/TextComponent.java =================================================================== --- src/main/java/common/java/awt/TextComponent.java (revision 443362) +++ src/main/java/common/java/awt/TextComponent.java (working copy) @@ -878,9 +878,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (TextListener.class.isAssignableFrom(listenerType)) { - return getTextListeners(); + return (T[]) getTextListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/TextField.java =================================================================== --- src/main/java/common/java/awt/TextField.java (revision 443362) +++ src/main/java/common/java/awt/TextField.java (working copy) @@ -402,9 +402,9 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (ActionListener.class.isAssignableFrom(listenerType)) { - return getActionListeners(); + return (T[]) getActionListeners(); } return super.getListeners(listenerType); } Index: src/main/java/common/java/awt/Toolkit.java =================================================================== --- src/main/java/common/java/awt/Toolkit.java (revision 443362) +++ src/main/java/common/java/awt/Toolkit.java (working copy) @@ -644,7 +644,7 @@ protected abstract EventQueue getSystemEventQueueImpl(); - public abstract Map mapInputMethodHighlight(InputMethodHighlight highlight) throws HeadlessException; + public abstract Map mapInputMethodHighlight(InputMethodHighlight highlight) throws HeadlessException; Map mapInputMethodHighlightImpl(InputMethodHighlight highlight) throws HeadlessException { Index: src/main/java/common/java/awt/Window.java =================================================================== --- src/main/java/common/java/awt/Window.java (revision 443362) +++ src/main/java/common/java/awt/Window.java (working copy) @@ -382,7 +382,7 @@ } @Override - public Set getFocusTraversalKeys(int id) { + public Set getFocusTraversalKeys(int id) { //why override? toolkit.lockAWT(); try { @@ -1071,13 +1071,13 @@ } @Override - public EventListener[] getListeners(Class listenerType) { + public T[] getListeners(Class listenerType) { if (WindowFocusListener.class.isAssignableFrom(listenerType)) { - return getWindowFocusListeners(); + return (T[]) getWindowFocusListeners(); } else if (WindowStateListener.class.isAssignableFrom(listenerType)) { - return getWindowStateListeners(); + return (T[]) getWindowStateListeners(); } else if (WindowListener.class.isAssignableFrom(listenerType)) { - return getWindowListeners(); + return (T[]) getWindowListeners(); } else { return super.getListeners(listenerType); } Index: src/main/java/common/org/apache/harmony/awt/ListenerList.java =================================================================== --- src/main/java/common/org/apache/harmony/awt/ListenerList.java (revision 443354) +++ src/main/java/common/org/apache/harmony/awt/ListenerList.java (working copy) @@ -34,13 +34,13 @@ * 2. To ensure call for all listeners as atomic operation * 3. To support system listeners that are needed for built-in AWT components */ -public class ListenerList implements Serializable { +public class ListenerList implements Serializable { private static final long serialVersionUID = 9180703263299648154L; private static final Iterator dummyIterator = new ArrayList().iterator(); private transient ArrayList systemList = null; - private transient ArrayList userList = null; + private transient ArrayList userList = null; /** * Adds system listener to this list. @@ -59,18 +59,18 @@ * * @param listener - listener to be added. */ - public void addUserListener(Object listener) { + public void addUserListener(T listener) { if (listener == null) { return; } // transactionally replace old list synchronized (this) { if (userList == null) { - userList = new ArrayList(); + userList = new ArrayList(); userList.add(listener); return; } - ArrayList newList = new ArrayList(userList); + ArrayList newList = new ArrayList(userList); newList.add(listener); userList = newList; } @@ -90,7 +90,7 @@ if (userList == null || !userList.contains(listener)) { return; } - ArrayList newList = new ArrayList(userList); + ArrayList newList = new ArrayList(userList); newList.remove(listener); userList = (newList.size() > 0 ? newList : null); } @@ -115,9 +115,9 @@ * * @return list of all user listeners. */ - public List getUserListeners() { + public List getUserListeners() { synchronized (this) { - return new ArrayList(userList); + return new ArrayList(userList); } } @@ -175,7 +175,7 @@ stream.defaultReadObject(); systemList = (ArrayList)stream.readObject(); - userList = (ArrayList)stream.readObject(); + userList = (ArrayList)stream.readObject(); } }