Commit 64165b30 by Tom Tromey Committed by Tom Tromey

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
parent 05ed1296
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> 2002-03-24 Eric Blake <ebb9@email.byu.edu>
* java/beans/IntrospectionException.java: Update to 1.4. * java/beans/IntrospectionException.java: Update to 1.4.
......
...@@ -261,13 +261,13 @@ processActionEvent(ActionEvent event) ...@@ -261,13 +261,13 @@ processActionEvent(ActionEvent event)
void void
dispatchEventImpl(AWTEvent e) dispatchEventImpl(AWTEvent e)
{ {
super.dispatchEventImpl(e);
if (e.id <= ActionEvent.ACTION_LAST if (e.id <= ActionEvent.ACTION_LAST
&& e.id >= ActionEvent.ACTION_FIRST && e.id >= ActionEvent.ACTION_FIRST
&& (action_listeners != null && (action_listeners != null
|| (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0)) || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
processEvent(e); processEvent(e);
else
super.dispatchEventImpl(e);
} }
/*************************************************************************/ /*************************************************************************/
......
...@@ -365,6 +365,18 @@ processItemEvent(ItemEvent event) ...@@ -365,6 +365,18 @@ processItemEvent(ItemEvent event)
item_listeners.itemStateChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
...@@ -258,6 +258,18 @@ processItemEvent(ItemEvent event) ...@@ -258,6 +258,18 @@ processItemEvent(ItemEvent event)
item_listeners.itemStateChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
...@@ -431,6 +431,18 @@ processItemEvent(ItemEvent event) ...@@ -431,6 +431,18 @@ processItemEvent(ItemEvent event)
item_listeners.itemStateChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
...@@ -989,6 +989,23 @@ processItemEvent(ItemEvent event) ...@@ -989,6 +989,23 @@ processItemEvent(ItemEvent event)
item_listeners.itemStateChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
...@@ -80,7 +80,7 @@ private boolean enabled; ...@@ -80,7 +80,7 @@ private boolean enabled;
/** /**
* @serial The mask of events that are enabled for this menu item. * @serial The mask of events that are enabled for this menu item.
*/ */
private long eventMask; long eventMask;
/** /**
* @serial This menu item's label * @serial This menu item's label
......
...@@ -660,6 +660,18 @@ processAdjustmentEvent(AdjustmentEvent event) ...@@ -660,6 +660,18 @@ processAdjustmentEvent(AdjustmentEvent event)
adjustment_listeners.adjustmentValueChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
/* TextComponent.java -- Widgets for entering text /* 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. This file is part of GNU Classpath.
...@@ -408,6 +408,18 @@ processTextEvent(TextEvent event) ...@@ -408,6 +408,18 @@ processTextEvent(TextEvent event)
textListener.textValueChanged(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
/* TextField.java -- A one line text entry field /* 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. This file is part of GNU Classpath.
...@@ -452,6 +452,18 @@ processActionEvent(ActionEvent event) ...@@ -452,6 +452,18 @@ processActionEvent(ActionEvent event)
action_listeners.actionPerformed(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);
}
/*************************************************************************/ /*************************************************************************/
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment