stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6693974: Unify EventQueue$EventQueueItem and SunToolkit.$EventQueueItem classes

Browse Source 
Reviewed-by: volk, art
This commit is contained in:
Andrei Dmitriev 2008-07-07 16:09:39 +04:00
parent 9e5e0e9d44
commit 29aa2aecb4
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/java/awt/Component.java
View File

@ -5737,7 +5737,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
} }
} }
transient EventQueueItem[] eventCache; transient sun.awt.EventQueueItem[] eventCache;
/** /**
* @see #isCoalescingEnabled * @see #isCoalescingEnabled

18
jdk/src/share/classes/java/awt/EventQueue.java
View File

@ -42,6 +42,7 @@ import sun.awt.AppContext;
import sun.awt.AWTAutoShutdown; import sun.awt.AWTAutoShutdown;
import sun.awt.PeerEvent; import sun.awt.PeerEvent;
import sun.awt.SunToolkit; import sun.awt.SunToolkit;
import sun.awt.EventQueueItem;
/** /**
* <code>EventQueue</code> is a platform-independent class * <code>EventQueue</code> is a platform-independent class
@ -359,7 +360,7 @@ public class EventQueue {
entry != null; entry = entry.next) entry != null; entry = entry.next)
{ {
// Give Component.coalesceEvents a chance // Give Component.coalesceEvents a chance
if (entry.event.getSource() == source && entry.id == id) { if (entry.event.getSource() == source && entry.event.getID() == id) {
AWTEvent coalescedEvent = source.coalesceEvents( AWTEvent coalescedEvent = source.coalesceEvents(
entry.event, e); entry.event, e);
if (coalescedEvent != null) { if (coalescedEvent != null) {
@ -499,7 +500,7 @@ public class EventQueue {
for (EventQueueItem entry = queues[i].head, prev = null; for (EventQueueItem entry = queues[i].head, prev = null;
entry != null; prev = entry, entry = entry.next) entry != null; prev = entry, entry = entry.next)
{ {
if (entry.id == id) { if (entry.event.getID() == id) {
if (prev == null) { if (prev == null) {
queues[i].head = entry.next; queues[i].head = entry.next;
} else { } else {
@ -545,7 +546,7 @@ public class EventQueue {
for (int i = NUM_PRIORITIES - 1; i >= 0; i--) { for (int i = NUM_PRIORITIES - 1; i >= 0; i--) {
EventQueueItem q = queues[i].head; EventQueueItem q = queues[i].head;
for (; q != null; q = q.next) { for (; q != null; q = q.next) {
if (q.id == id) { if (q.event.getID() == id) {
return q.event; return q.event;
} }
} }
@ -1051,14 +1052,3 @@ class Queue {
EventQueueItem head; EventQueueItem head;
EventQueueItem tail; EventQueueItem tail;
} }
class EventQueueItem {
AWTEvent event;
int id;
EventQueueItem next;
EventQueueItem(AWTEvent evt) {
event = evt;
id = evt.getID();
}
}

9
jdk/src/share/classes/sun/awt/SunToolkit.java
View File

@ -2039,12 +2039,3 @@ class PostEventQueue {
SunToolkit.wakeupEventQueue(eventQueue, event.getSource() == AWTAutoShutdown.getInstance()); SunToolkit.wakeupEventQueue(eventQueue, event.getSource() == AWTAutoShutdown.getInstance());
} }
} // class PostEventQueue } // class PostEventQueue
class EventQueueItem {
AWTEvent event;
EventQueueItem next;
EventQueueItem(AWTEvent evt) {
event = evt;
}
} // class EventQueueItem