From da66af5951b18b6f5e8752cbbe11f5f842332a33 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 10 Dec 2006 20:25:39 +0000
Subject: 2006-12-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)
---
 java/awt/Choice.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/awt/Choice.java')

diff --git a/java/awt/Choice.java b/java/awt/Choice.java
index c3ec7b4c5..ae89b9e99 100644
--- a/java/awt/Choice.java
+++ b/java/awt/Choice.java
@@ -520,11 +520,11 @@ public class Choice extends Component
    *
    * @since 1.3
    */
-  public EventListener[] getListeners (Class listenerType)
+  public <T extends EventListener> T[] getListeners (Class<T> listenerType)
   {
     if (listenerType == ItemListener.class)
       return AWTEventMulticaster.getListeners (item_listeners, listenerType);
-    
+
     return super.getListeners (listenerType);
   }
 
-- 
cgit v1.2.1