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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aec5a2914692ef580b338405f1ac3548d3e65756..22982aaf9d2a6c130d962b9285255e4d1c85a2b3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2002-03-24  Tom Tromey  <tromey@redhat.com>
+
+       * 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.
+
 2002-03-24  Eric Blake  <ebb9@email.byu.edu>
 
        * java/beans/IntrospectionException.java: Update to 1.4.

diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java
index ccc7821d578d6612778b762aad4c4c328b1c57af..139890f7315039583cc77b00f40452533db52b86 100644 (file)
--- 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 4212da959351a6c1b0fbc4848cd451128abb0224..1268fe86eca4429eb8cb7542d0ac46ceee1d6228 100644 (file)
--- 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 b75f617275692dfb910fee84f339bd1efbd73fe6..2f7ecd79fc5efa34a3fb587930ca96df46fb1338 100644 (file)
--- 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 5feeed0434116f0262ea469fdf86945d03114eb3..e90346cc30ad2a2fcb45431715bcea1d50adf72a 100644 (file)
--- 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 955d08fb1dc9a88ba226e3c708e2be93567aa053..c171b8f285e20d0759ddf0595943b27172b131ad 100644 (file)
--- 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 25191d488d9fbcb4c71478ee1bfdf2b93b80b143..ea92f9ab8e4319118484ab5c0d5d776df2ae5079 100644 (file)
--- 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 d8915b7f84267cf834d7d62ecf840ac83934f76e..1f1875955bf04b30f18782990dccd88e16563749 100644 (file)
--- 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 a90cb80e52d2825293ad02ca3568950841663a60..4802f47db848028e951a844262956474df6d3962 100644 (file)
--- 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 5499305f8751b1937973031602151f4b8c714f70..28d444ce95fd80c4bf5ee65b7daed23c5904ca85 100644 (file)
--- 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);
+}
+
 /*************************************************************************/
 
 /**