[Jnode-svn-commits] SF.net SVN: jnode: [3097] trunk/core/src/classpath/java/java/awt

[<ls...@us...>]

Revision: 3097
          http://jnode.svn.sourceforge.net/jnode/?rev=3097&view=rev
Author:   lsantha
Date:     2007-01-28 13:36:49 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
Classpath patches.

Modified Paths:
--------------
    trunk/core/src/classpath/java/java/awt/Button.java
    trunk/core/src/classpath/java/java/awt/Component.java
    trunk/core/src/classpath/java/java/awt/MenuBar.java

Modified: trunk/core/src/classpath/java/java/awt/Button.java
===================================================================
--- trunk/core/src/classpath/java/java/awt/Button.java	2007-01-28 20:52:02 UTC (rev 3096)
+++ trunk/core/src/classpath/java/java/awt/Button.java	2007-01-28 21:36:49 UTC (rev 3097)
@@ -352,11 +352,11 @@
 	 *
 	 * @since 1.3 
 	 */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
 		if (listenerType == ActionListener.class)
-			return getActionListeners();
-		return (EventListener[]) Array.newInstance(listenerType, 0);
+      return (T[]) getActionListeners();
+    return (T[]) Array.newInstance(listenerType, 0);
 	}
 
 /*************************************************************************/

Modified: trunk/core/src/classpath/java/java/awt/Component.java
===================================================================
--- trunk/core/src/classpath/java/java/awt/Component.java	2007-01-28 20:52:02 UTC (rev 3096)
+++ trunk/core/src/classpath/java/java/awt/Component.java	2007-01-28 21:36:49 UTC (rev 3097)
@@ -2847,29 +2847,29 @@
 	 * @see #getPropertyChangeListeners()
 	 * @since 1.3
 	 */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
 		if (listenerType == ComponentListener.class)
-			return getComponentListeners();
+      return (T[]) getComponentListeners();
 		if (listenerType == FocusListener.class)
-			return getFocusListeners();
+      return (T[]) getFocusListeners();
 		if (listenerType == HierarchyListener.class)
-			return getHierarchyListeners();
+      return (T[]) getHierarchyListeners();
 		if (listenerType == HierarchyBoundsListener.class)
-			return getHierarchyBoundsListeners();
+      return (T[]) getHierarchyBoundsListeners();
 		if (listenerType == KeyListener.class)
-			return getKeyListeners();
+      return (T[]) getKeyListeners();
 		if (listenerType == MouseListener.class)
-			return getMouseListeners();
+      return (T[]) getMouseListeners();
 		if (listenerType == MouseMotionListener.class)
-			return getMouseMotionListeners();
+      return (T[]) getMouseMotionListeners();
 		if (listenerType == MouseWheelListener.class)
-			return getMouseWheelListeners();
+      return (T[]) getMouseWheelListeners();
 		if (listenerType == InputMethodListener.class)
-			return getInputMethodListeners();
+      return (T[]) getInputMethodListeners();
 		if (listenerType == PropertyChangeListener.class)
-			return getPropertyChangeListeners();
-		return (EventListener[]) Array.newInstance(listenerType, 0);
+      return (T[]) getPropertyChangeListeners();
+    return (T[]) Array.newInstance(listenerType, 0);
 	}
 
 	/**

Modified: trunk/core/src/classpath/java/java/awt/MenuBar.java
===================================================================
--- trunk/core/src/classpath/java/java/awt/MenuBar.java	2007-01-28 20:52:02 UTC (rev 3096)
+++ trunk/core/src/classpath/java/java/awt/MenuBar.java	2007-01-28 21:36:49 UTC (rev 3097)
@@ -272,7 +272,7 @@
   *
    * @return a list of all shortcuts for the menus in this menu bar
   */
-  public synchronized Enumeration shortcuts()
+  public synchronized Enumeration<MenuShortcut> shortcuts()
   {
   Vector shortcuts = new Vector();
   Enumeration e = menus.elements();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.