OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2002-03-24 22:37:51 +00:00 committed by Tom Tromey
parent 05ed12966c
commit 64165b30e6
10 changed files with 107 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libjava/ChangeLog
View File

@ -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.

4
libjava/java/awt/Button.java
View File

@ -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);
}
/*************************************************************************/

12
libjava/java/awt/Checkbox.java
View File

@ -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);
}
/*************************************************************************/
/**

12
libjava/java/awt/CheckboxMenuItem.java
View File

@ -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);
}
/*************************************************************************/
/**

12
libjava/java/awt/Choice.java
View File

@ -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);
}
/*************************************************************************/
/**

17
libjava/java/awt/List.java
View File

@ -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);
}
/*************************************************************************/
/**

2
libjava/java/awt/MenuItem.java
View File

@ -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

12
libjava/java/awt/Scrollbar.java
View File

@ -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);
}
/*************************************************************************/
/**

14
libjava/java/awt/TextComponent.java
View File

@ -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);
}
/*************************************************************************/
/**

14
libjava/java/awt/TextField.java
View File

@ -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);
}
/*************************************************************************/
/**