2005-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* gnu/java/awt/peer/qt/QtGraphics.java:
	(getRenderingHints()): Create a clone as no such
	constructor exists with generic typing.
	(setRenderingHints(Map<?,?>)): Added parametric typing
	and fixed use of RenderingHints constructor.
	* java/awt/AWTEventMulticaster.java:
	(getListeners(EventListener,Class<T>)): Added generic
	typing.
	* java/awt/Component.java:
	(getListeners(Class<T>)): Likewise.
	(getFocusTraversalKeys(int)): Likewise.
	* java/awt/Font.java:
	(Font(Map<? extends Attribute,?>)): Likewise.
	(deriveFont(Map<? extends Attribute,?>)): Likewise.
	(getAttributes()): Likewise.
	(getAvailableAttributes()): Simplified naming with static import.
	(getFont(Map<? extends Attribute,?>)): Added generic typing.
	* java/awt/Graphics2D.java:
	(setRenderingHints(Map<?,?>)): Likewise.
	(addRenderingHints(Map<?,?>)): Likewise.
	* java/awt/KeyboardFocusManager.java:
	(setDefaultFocusTraversalKeys(int,Set<? extends KeyStroke>)):
	Likewise.
	(getKeyEventDispatchers()): Likewise.
	(getKeyEventPostProcessors()): Likewise.
	* java/awt/MenuItem.java:
	(getListeners(Class<T>)): Likewise.
	* java/awt/RenderingHints.java:
	(RenderingHints(Map<Key,?>)): Likewise.
	(putAll(Map<?,?>)): Likewise.
	(keySet()): Likewise.
	(values()): Likewise.
	(entrySet()): Likewise.
	* java/awt/Toolkit.java:
	(desktopProperties): Likewise.
	(createDragGestureRecognizer(Class<T>,DragSource,Component,int,
	DragGestureListener)): Likewise.
	(mapInputMethodHighlight(InputMethodHighlight)): Likewise.
	* java/lang/Class.java:
	(getDeclaringClass()): Likewise.
	* java/lang/Enum.java:
	(valueOf(Class<S>,String)): Fixed return type.
	* java/lang/SecurityManager.java:
	(checkMemberAccess(Class<?>,int)): Likewise.
	* java/lang/reflect/Array.java:
	(newInstance(Class<?>,int)): Likewise.
	(newInstance(Class<?>,int[])): Likewise.
	* vm/reference/java/lang/reflect/Constructor.java:
	(getTypeParameters()): Type parameter changed from ? to Constructor.
	* vm/reference/java/lang/reflect/Field.java:
	(getDeclaringClass()): Added generic typing.
	(getType()): Likewise.
	* vm/reference/java/lang/reflect/Method.java:
	(getDeclaringClass()): Likewise.
	(getExceptionTypes()): Likewise.
	(getParameterTypes()): Likewise.

1 files changed, 7 insertions, 5 deletions

diff --git a/java/awt/KeyboardFocusManager.java b/java/awt/KeyboardFocusManager.java
index a73d31ff7..a61a9a810 100644
--- a/java/awt/KeyboardFocusManager.java
+++ b/java/awt/KeyboardFocusManager.java
@@ -600,7 +600,9 @@ public abstract class KeyboardFocusManager
    * @see #UP_CYCLE_TRAVERSAL_KEYS
    * @see #DOWN_CYCLE_TRAVERSAL_KEYS
    */
-  public void setDefaultFocusTraversalKeys (int id, Set keystrokes)
+  public void setDefaultFocusTraversalKeys (int id,
+					    Set<? extends AWTKeyStroke>
+					    keystrokes)
   {
     if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
@@ -1034,9 +1036,9 @@ public abstract class KeyboardFocusManager
    * @return A list of explicitly registered key event dispatchers.
    * @see KeyboardFocusManager#addKeyEventDispatcher(java.awt.KeyEventDispatcher)
    */
-  protected List getKeyEventDispatchers ()
+  protected List<KeyEventDispatcher> getKeyEventDispatchers ()
   {
-    return (List) keyEventDispatchers.clone ();
+    return (List<KeyEventDispatcher>) keyEventDispatchers.clone ();
   }
 
   /**
@@ -1091,9 +1093,9 @@ public abstract class KeyboardFocusManager
    * @return A list of explicitly registered key event post processors.
    * @see KeyboardFocusManager#addKeyEventPostProcessor(java.awt.KeyEventPostProcessor)
    */
-  protected List getKeyEventPostProcessors ()
+  protected List<KeyEventPostProcessor> getKeyEventPostProcessors ()
   {
-    return (List) keyEventPostProcessors.clone ();
+    return (List<KeyEventPostProcessor>) keyEventPostProcessors.clone ();
   }
 
   /**