AWT/Swing merge from GNU Classpath.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56147 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 14 insertions, 8 deletions

diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java
index ea92f9ab8e4..ffef30ecf8c 100644
--- a/libjava/java/awt/MenuItem.java
+++ b/libjava/java/awt/MenuItem.java
@@ -42,6 +42,7 @@ import java.awt.peer.MenuItemPeer;
 import java.awt.peer.MenuComponentPeer;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.lang.reflect.Array;
 import java.util.EventListener;
 
 /**
@@ -385,19 +386,24 @@ removeActionListener(ActionListener l)
   action_listeners = AWTEventMulticaster.remove(action_listeners, l);
 }
 
+  public synchronized ActionListener[] getActionListeners()
+  {
+    return (ActionListener[])
+      AWTEventMulticaster.getListeners(action_listeners,
+                                       ActionListener.class);
+  }
+
 /** Returns all registered EventListers of the given listenerType. 
  * listenerType must be a subclass of EventListener, or a 
  * ClassClassException is thrown.
  * @since 1.3 
  */
-public EventListener[]
-getListeners(Class listenerType)
-{
-  if (listenerType == ActionListener.class)
-    return Component.getListenersImpl(listenerType, action_listeners);
-  else
-    return Component.getListenersImpl(listenerType, null);
-}
+  public EventListener[] getListeners(Class listenerType)
+  {
+    if (listenerType == ActionListener.class)
+      return getActionListeners();
+    return (EventListener[]) Array.newInstance(listenerType, 0);
+  }
 
 /*************************************************************************/