jdk-sandbox: comparison jdk/src/share/classes/sun/awt/SunToolkit.java

equal deleted inserted replaced

-:1954edd3b7a7
+:67ca55732362
 * public masks defined in AWTEvent.  Should be used as the mask
 * value for Toolkit.addAWTEventListener.
 */
 public static final int GRAB_EVENT_MASK = 0x80000000;
-private static Field syncLWRequestsField;
 private static Method  wakeupMethod;
-private static Field componentKeyField;
-private static Field menuComponentKeyField;
-private static Field trayIconKeyField;
-private static Field componentAppContextField;
-private static Field menuComponentAppContextField;
-private static Field isPostedField;
 /* The key to put()/get() the PostEventQueue into/from the AppContext.
 */
 private static final String POST_EVENT_QUEUE_KEY = "PostEventQueue";
 /**
 // Maps from non-Component/MenuComponent to AppContext.
 // WeakHashMap<Component,AppContext>
 private static final Map appContextMap =
 Collections.synchronizedMap(new WeakHashMap());
 /**
 * Sets the appContext field of target. If target is not a Component or
 * MenuComponent, this returns false.
 */
-private static boolean setAppContext(Object target, AppContext context)
+private static boolean setAppContext(Object target,
-{
+AppContext context) {
-if (!(target instanceof Component) && !(target instanceof MenuComponent)) {
+if (target instanceof Component) {
+AWTAccessor.getComponentAccessor().
+setAppContext((Component)target, context);
+} else if (target instanceof MenuComponent) {
+AWTAccessor.getMenuComponentAccessor().
+setAppContext((MenuComponent)target, context);
+} else {
 return false;
 }
-try{
-if (target instanceof Component){
-if (componentAppContextField == null) {
-componentAppContextField = getField(Component.class, "appContext");
-}
-componentAppContextField.set(target, context);
-} else if (target instanceof MenuComponent) {
-if (menuComponentAppContextField == null) {
-menuComponentAppContextField = getField(MenuComponent.class, "appContext");
-}
-menuComponentAppContextField.set(target, context);
-}
-} catch( IllegalAccessException e){
-assert false;
-}
 return true;
 }
 /**
 * Returns the appContext field for target. If target is not a
 * Component or MenuComponent this returns null.
 */
 private static AppContext getAppContext(Object target) {
-AppContext retObj = null;
+if (target instanceof Component) {
-try{
+return AWTAccessor.getComponentAccessor().
-if (target instanceof Component){
+getAppContext((Component)target);
-if (componentAppContextField == null) {
+} else if (target instanceof MenuComponent) {
-componentAppContextField = getField(Component.class, "appContext");
+return AWTAccessor.getMenuComponentAccessor().
-}
+getAppContext((MenuComponent)target);
-retObj = (AppContext) componentAppContextField.get(target);
+} else {
-} else if (target instanceof MenuComponent) {
+return null;
-if (menuComponentAppContextField == null) {
+}
-menuComponentAppContextField = getField(MenuComponent.class, "appContext");
-}
-retObj = (AppContext) menuComponentAppContextField.get(target);
-}
-} catch( IllegalAccessException e){
-assert false;
-}
-return retObj;
 }
 /*
 * Fetch the AppContext associated with the given target.
 * This can be used to determine things like which EventQueue
 *             should be set
 * @param    status the value of lightweight focus request status
 */
 public static void setLWRequestStatus(Window changed,boolean status){
-if (syncLWRequestsField == null){
+AWTAccessor.getWindowAccessor().setLWRequestStatus(changed, status);
-syncLWRequestsField = getField(Window.class, "syncLWRequests");
-}
-try{
-if (syncLWRequestsField != null){
-syncLWRequestsField.setBoolean(changed, status);
-}
-} catch( IllegalAccessException e){
-assert false;
-}
 };
 public static void checkAndSetPolicy(Container cont, boolean isSwingCont)
 {
 FocusTraversalPolicy defaultPolicy = KeyboardFocusManager
 /*
 * Post AWTEvent of high priority.
 */
 public static void postPriorityEvent(final AWTEvent e) {
-if (isPostedField == null) {
-isPostedField = getField(AWTEvent.class, "isPosted");
-}
 PeerEvent pe = new PeerEvent(Toolkit.getDefaultToolkit(), new Runnable() {
 public void run() {
-try {
+AWTAccessor.getAWTEventAccessor().setPosted(e);
-isPostedField.setBoolean(e, true);
-} catch (IllegalArgumentException e) {
-assert(false);
-} catch (IllegalAccessException e) {
-assert(false);
-}
 ((Component)e.getSource()).dispatchEvent(e);
 }
 }, PeerEvent.ULTIMATE_PRIORITY_EVENT);
 postEvent(targetToAppContext(e.getSource()), pe);
 }
 throw new InvocationTargetException(eventThrowable);
 }
 }
 /*
-* Returns next queue for the given EventQueue which has private access
-*/
-private static EventQueue getNextQueue(final Object o) {
-EventQueue result = null;
-try{
-Field nextQueueField = getField(EventQueue.class,
-"nextQueue");
-result = (EventQueue)nextQueueField.get(o);
-} catch( IllegalAccessException e){
-assert false;
-}
-return result;
-}
-/*
-* Returns dispatch thread for the given EventQueue which has private access
-*/
-private static Thread getDispatchThread(final Object o) {
-Thread result = null;
-try{
-Field dispatchThreadField = getField(EventQueue.class,
-"dispatchThread");
-result = (Thread)dispatchThreadField.get(o);
-} catch( IllegalAccessException e){
-assert false;
-}
-return result;
-}
-/*
 * Returns true if the calling thread is the event dispatch thread
 * contained within AppContext which associated with the given target.
 * Use this call to ensure that a given task is being executed
 * (or not being) on the event dispatch thread for the given target.
 */
 public static boolean isDispatchThreadForAppContext(Object target) {
 AppContext appContext = targetToAppContext(target);
 EventQueue eq = (EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY);
-EventQueue next = getNextQueue(eq);
+AWTAccessor.EventQueueAccessor accessor = AWTAccessor.getEventQueueAccessor();
+EventQueue next = accessor.getNextQueue(eq);
 while (next != null) {
 eq = next;
-next = getNextQueue(eq);
+next = accessor.getNextQueue(eq);
 }
-return (Thread.currentThread() == getDispatchThread(eq));
+return (Thread.currentThread() == accessor.getDispatchThread(eq));
 }
 public Dimension getScreenSize() {
 return new Dimension(getScreenWidth(), getScreenHeight());
 }
 */
 protected boolean needsXEmbedImpl() {
 return false;
 }
-private static Dialog.ModalExclusionType DEFAULT_MODAL_EXCLUSION_TYPE;
+private static Dialog.ModalExclusionType DEFAULT_MODAL_EXCLUSION_TYPE = null;
-static {
-DEFAULT_MODAL_EXCLUSION_TYPE = (Dialog.ModalExclusionType)AccessController.doPrivileged(new PrivilegedAction() {
-public Object run() {
-Dialog.ModalExclusionType defaultType = Dialog.ModalExclusionType.NO_EXCLUDE;
-try {
-java.lang.reflect.Field f = Dialog.class.getDeclaredField("DEFAULT_MODAL_EXCLUSION_TYPE");
-f.setAccessible(true);
-defaultType = (Dialog.ModalExclusionType)f.get(null);
-} catch (Exception e) {
-}
-return defaultType;
-}
-});
-}
 /**
 * Returns whether the XEmbed server feature is requested by
 * developer.  If true, Toolkit should return an
 * XEmbed-server-enabled CanvasPeer instead of the ordinary CanvasPeer.
 * @see sun.awt.SunToolkit#isModalExcludedSupported
 * @see sun.awt.SunToolkit#isModalExcluded(java.awt.Window)
 */
 public static void setModalExcluded(Window window)
 {
+if (DEFAULT_MODAL_EXCLUSION_TYPE == null) {
+DEFAULT_MODAL_EXCLUSION_TYPE = Dialog.ModalExclusionType.APPLICATION_EXCLUDE;
+}
 window.setModalExclusionType(DEFAULT_MODAL_EXCLUSION_TYPE);
 }
 /*
 * Returns whether the specified window is blocked by modal dialogs.
 *
 * @since 1.5
 */
 public static boolean isModalExcluded(Window window)
 {
+if (DEFAULT_MODAL_EXCLUSION_TYPE == null) {
+DEFAULT_MODAL_EXCLUSION_TYPE = Dialog.ModalExclusionType.APPLICATION_EXCLUDE;
+}
 return window.getModalExclusionType().compareTo(DEFAULT_MODAL_EXCLUSION_TYPE) >= 0;
 }
 /**
 * Overridden in XToolkit and WToolkit
 * Descendants of the SunToolkit should override and put their own logic here.
 */
 public int getNumberOfButtons(){
 return 3;
 }
+/**
+* Checks that the given object implements/extends the given
+* interface/class.
+*
+* Note that using the instanceof operator causes a class to be loaded.
+* Using this method doesn't load a class and it can be used instead of
+* the instanceof operator for performance reasons.
+*
+* @param obj Object to be checked
+* @param type The name of the interface/class. Must be
+* fully-qualified interface/class name.
+* @return true, if this object implements/extends the given
+*         interface/class, false, otherwise, or if obj or type is null
+*/
+public static boolean isInstanceOf(Object obj, String type) {
+if (obj == null) return false;
+if (type == null) return false;
+return isInstanceOf(obj.getClass(), type);
+}
+private static boolean isInstanceOf(Class cls, String type) {
+if (cls == null) return false;
+if (cls.getName().equals(type)) {
+return true;
+}
+for (Class c : cls.getInterfaces()) {
+if (c.getName().equals(type)) {
+return true;
+}
+}
+return isInstanceOf(cls.getSuperclass(), type);
+}
 } // class SunToolkit
 /*
 * PostEventQueue is a Thread that runs in the same AppContext as the

changeset 3084	67ca55732362
parent 2810	fa49c6a06baf
child 3237	7c6c2d9361d9