MenuItem.java (eventMask): No longer private.

	* java/awt/MenuItem.java (eventMask): No longer private.
	* java/awt/Button.java (dispatchEventImpl): Only dispatch to
	superclass if we didn't handle event.
	* java/awt/Checkbox.java (dispatchEventImpl): New method.
	* java/awt/CheckboxMenuItem.java (dispatchEventImpl): New method.
	* java/awt/Choice.java (dispatchEventImpl): New method.
	* java/awt/List.java (dispatchEventImpl): New method.
	* java/awt/Scrollbar.java (dispatchEventImpl): New method.
	* java/awt/TextComponent.java (dispatchEventImpl): New method.
	* java/awt/TextField.java (dispatchEventImpl): New method.

From-SVN: r51277

9 files changed, 94 insertions, 5 deletions

diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java
index ccc7821..139890f 100644
--- a/libjava/java/awt/Button.java
+++ b/libjava/java/awt/Button.java
@@ -261,13 +261,13 @@ processActionEvent(ActionEvent event)
 void
 dispatchEventImpl(AWTEvent e)
 {
-  super.dispatchEventImpl(e);
-
   if (e.id <= ActionEvent.ACTION_LAST 
       && e.id >= ActionEvent.ACTION_FIRST
       && (action_listeners != null 
 	  || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
     processEvent(e);
+  else
+    super.dispatchEventImpl(e);
 }
 
 /*************************************************************************/
diff --git a/libjava/java/awt/Checkbox.java b/libjava/java/awt/Checkbox.java
index 4212da9..1268fe8 100644
--- a/libjava/java/awt/Checkbox.java
+++ b/libjava/java/awt/Checkbox.java
@@ -365,6 +365,18 @@ processItemEvent(ItemEvent event)
     item_listeners.itemStateChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= ItemEvent.ITEM_LAST
+      && e.id >= ItemEvent.ITEM_FIRST
+      && (item_listeners != null 
+	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/CheckboxMenuItem.java b/libjava/java/awt/CheckboxMenuItem.java
index b75f617..2f7ecd7 100644
--- a/libjava/java/awt/CheckboxMenuItem.java
+++ b/libjava/java/awt/CheckboxMenuItem.java
@@ -258,6 +258,18 @@ processItemEvent(ItemEvent event)
     item_listeners.itemStateChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= ItemEvent.ITEM_LAST 
+      && e.id >= ItemEvent.ITEM_FIRST
+      && (item_listeners != null 
+	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/Choice.java b/libjava/java/awt/Choice.java
index 5feeed0..e90346c 100644
--- a/libjava/java/awt/Choice.java
+++ b/libjava/java/awt/Choice.java
@@ -431,6 +431,18 @@ processItemEvent(ItemEvent event)
     item_listeners.itemStateChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= ItemEvent.ITEM_LAST
+      && e.id >= ItemEvent.ITEM_FIRST
+      && (item_listeners != null 
+	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/List.java b/libjava/java/awt/List.java
index 955d08f..c171b8f 100644
--- a/libjava/java/awt/List.java
+++ b/libjava/java/awt/List.java
@@ -989,6 +989,23 @@ processItemEvent(ItemEvent event)
     item_listeners.itemStateChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= ItemEvent.ITEM_LAST
+      && e.id >= ItemEvent.ITEM_FIRST
+      && (item_listeners != null 
+	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
+    processEvent(e);
+  else if (e.id <= ActionEvent.ACTION_LAST 
+	   && e.id >= ActionEvent.ACTION_FIRST
+	   && (action_listeners != null 
+	       || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java
index 25191d4..ea92f9a 100644
--- a/libjava/java/awt/MenuItem.java
+++ b/libjava/java/awt/MenuItem.java
@@ -80,7 +80,7 @@ private boolean enabled;
 /**
   * @serial The mask of events that are enabled for this menu item.
   */
-private long eventMask;
+long eventMask;
 
 /**
   * @serial This menu item's label
diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java
index d8915b7..1f18759 100644
--- a/libjava/java/awt/Scrollbar.java
+++ b/libjava/java/awt/Scrollbar.java
@@ -660,6 +660,18 @@ processAdjustmentEvent(AdjustmentEvent event)
     adjustment_listeners.adjustmentValueChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= AdjustmentEvent.ADJUSTMENT_LAST 
+      && e.id >= AdjustmentEvent.ADJUSTMENT_FIRST
+      && (adjustment_listeners != null 
+	  || (eventMask & AWTEvent.ADJUSTMENT_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/TextComponent.java b/libjava/java/awt/TextComponent.java
index a90cb80..4802f47 100644
--- a/libjava/java/awt/TextComponent.java
+++ b/libjava/java/awt/TextComponent.java
@@ -1,5 +1,5 @@
 /* TextComponent.java -- Widgets for entering text
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -408,6 +408,18 @@ processTextEvent(TextEvent event)
     textListener.textValueChanged(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= TextEvent.TEXT_LAST 
+      && e.id >= TextEvent.TEXT_FIRST
+      && (textListener != null 
+	  || (eventMask & AWTEvent.TEXT_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**
diff --git a/libjava/java/awt/TextField.java b/libjava/java/awt/TextField.java
index 5499305..28d444c 100644
--- a/libjava/java/awt/TextField.java
+++ b/libjava/java/awt/TextField.java
@@ -1,5 +1,5 @@
 /* TextField.java -- A one line text entry field
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -452,6 +452,18 @@ processActionEvent(ActionEvent event)
     action_listeners.actionPerformed(event);
 }
 
+void
+dispatchEventImpl(AWTEvent e)
+{
+  if (e.id <= ActionEvent.ACTION_LAST 
+      && e.id >= ActionEvent.ACTION_FIRST
+      && (action_listeners != null 
+	  || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
+    processEvent(e);
+  else
+    super.dispatchEventImpl(e);
+}
+
 /*************************************************************************/
 
 /**