6837293: Reapply fix for 6588003 to JDK7

Reviewed-by: alexp
This commit is contained in:
Peter Zhelezniakov 2009-05-05 12:07:37 +04:00
parent c3de9bf468
commit d663bac931

View file

@ -25,6 +25,7 @@
package javax.swing.text;
import java.util.Vector;
import sun.awt.AppContext;
/**
* A queue of text layout tasks.
@ -35,10 +36,10 @@ import java.util.Vector;
*/
public class LayoutQueue {
Vector<Runnable> tasks;
Thread worker;
private static final Object DEFAULT_QUEUE = new Object();
static LayoutQueue defaultQueue;
private Vector<Runnable> tasks;
private Thread worker;
/**
* Construct a layout queue.
@ -51,11 +52,16 @@ public class LayoutQueue {
* Fetch the default layout queue.
*/
public static LayoutQueue getDefaultQueue() {
AppContext ac = AppContext.getAppContext();
synchronized (DEFAULT_QUEUE) {
LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
if (defaultQueue == null) {
defaultQueue = new LayoutQueue();
ac.put(DEFAULT_QUEUE, defaultQueue);
}
return defaultQueue;
}
}
/**
* Set the default layout queue.
@ -63,7 +69,9 @@ public class LayoutQueue {
* @param q the new queue.
*/
public static void setDefaultQueue(LayoutQueue q) {
defaultQueue = q;
synchronized (DEFAULT_QUEUE) {
AppContext.getAppContext().put(DEFAULT_QUEUE, q);
}
}
/**