From 8aa540d2f783474d1d2e06f16744bf67b9c1facc Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Fri, 10 Mar 2006 21:46:48 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
---
 .../java/awt/event/AWTEventListenerProxy.java      | 68 ++--------------------
 1 file changed, 4 insertions(+), 64 deletions(-)

(limited to 'libjava/classpath/java/awt/event')

diff --git a/libjava/classpath/java/awt/event/AWTEventListenerProxy.java b/libjava/classpath/java/awt/event/AWTEventListenerProxy.java
index 3d9958b..55a4bfe 100644
--- a/libjava/classpath/java/awt/event/AWTEventListenerProxy.java
+++ b/libjava/classpath/java/awt/event/AWTEventListenerProxy.java
@@ -72,75 +72,15 @@ public class AWTEventListenerProxy extends EventListenerProxy
   }
 
   /**
-   * Forwards events on to the delegate if they meet the event mask.
+   * Forwards events on to the delegate.
+   *
+   * @param event the to forward to the delagate listener
    *
-   * @param event the property change event to filter
    * @throws NullPointerException if the delegate this was created with is null
    */
   public void eventDispatched(AWTEvent event)
   {
-    int id = event == null ? 0 : event.getID();
-    if (((mask & AWTEvent.ACTION_EVENT_MASK) != 0
-         && event instanceof ActionEvent)
-        || ((mask & AWTEvent.ADJUSTMENT_EVENT_MASK) != 0
-            && event instanceof AdjustmentEvent)
-        || ((mask & AWTEvent.COMPONENT_EVENT_MASK) != 0
-            && event instanceof ComponentEvent
-            && (id >= ComponentEvent.COMPONENT_FIRST
-                && id <= ComponentEvent.COMPONENT_LAST))
-        || ((mask & AWTEvent.CONTAINER_EVENT_MASK) != 0
-            && event instanceof ContainerEvent)
-        || ((mask & AWTEvent.FOCUS_EVENT_MASK) != 0
-            && event instanceof FocusEvent)
-        || ((mask & AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK) != 0
-            && event instanceof HierarchyEvent
-            && (id == HierarchyEvent.ANCESTOR_MOVED
-                || id == HierarchyEvent.ANCESTOR_RESIZED))
-        || ((mask & AWTEvent.HIERARCHY_EVENT_MASK) != 0
-            && event instanceof HierarchyEvent
-            && id == HierarchyEvent.HIERARCHY_CHANGED)
-        || ((mask & AWTEvent.INPUT_METHOD_EVENT_MASK) != 0
-            && event instanceof InputMethodEvent)
-        || ((mask & AWTEvent.INVOCATION_EVENT_MASK) != 0
-            && event instanceof InvocationEvent)
-        || ((mask & AWTEvent.ITEM_EVENT_MASK) != 0
-            && event instanceof ItemEvent)
-        || ((mask & AWTEvent.KEY_EVENT_MASK) != 0
-            && event instanceof KeyEvent)
-        || ((mask & AWTEvent.MOUSE_EVENT_MASK) != 0
-            && event instanceof MouseEvent
-            && (id == MouseEvent.MOUSE_PRESSED
-                || id == MouseEvent.MOUSE_RELEASED
-                || id == MouseEvent.MOUSE_CLICKED
-                || id == MouseEvent.MOUSE_ENTERED
-                || id == MouseEvent.MOUSE_EXITED))
-        || ((mask & AWTEvent.MOUSE_MOTION_EVENT_MASK) != 0
-            && event instanceof MouseEvent
-            && (id == MouseEvent.MOUSE_MOVED
-                || id == MouseEvent.MOUSE_DRAGGED))
-        || ((mask & AWTEvent.MOUSE_WHEEL_EVENT_MASK) != 0
-            && event instanceof MouseWheelEvent)
-        || ((mask & AWTEvent.PAINT_EVENT_MASK) != 0
-            && event instanceof PaintEvent)
-        || ((mask & AWTEvent.TEXT_EVENT_MASK) != 0
-            && event instanceof TextEvent)
-        || ((mask & AWTEvent.WINDOW_EVENT_MASK) != 0
-            && event instanceof WindowEvent
-            && (id == WindowEvent.WINDOW_OPENED
-                || id == WindowEvent.WINDOW_CLOSING
-                || id == WindowEvent.WINDOW_CLOSED
-                || id == WindowEvent.WINDOW_ICONIFIED
-                || id == WindowEvent.WINDOW_DEICONIFIED
-                || id == WindowEvent.WINDOW_ACTIVATED
-                || id == WindowEvent.WINDOW_DEACTIVATED))
-        || ((mask & AWTEvent.WINDOW_FOCUS_EVENT_MASK) != 0
-            && event instanceof WindowEvent
-            && (id == WindowEvent.WINDOW_GAINED_FOCUS
-                || id == WindowEvent.WINDOW_LOST_FOCUS))
-        || ((mask & AWTEvent.WINDOW_STATE_EVENT_MASK) != 0
-            && event instanceof WindowEvent
-            && id == WindowEvent.WINDOW_STATE_CHANGED))
-      ((AWTEventListener) getListener()).eventDispatched(event);
+    ((AWTEventListener) getListener()).eventDispatched(event);
   }
 
   /**
-- 
cgit v1.1