src/macosx/native/sun/awt/CTrayIcon.m

*** 301,314 ****
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeCreate
  (JNIEnv *env, jobject peer) {
      __block AWTTrayIcon *trayIcon = nil;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_NOT_APPKIT_THREAD;
  
      jobject thePeer = JNFNewGlobalRef(env, peer);
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          trayIcon = [[AWTTrayIcon alloc] initWithPeer:thePeer];
      }];
  
  JNF_COCOA_EXIT(env);
  
--- 301,313 ----
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeCreate
  (JNIEnv *env, jobject peer) {
      __block AWTTrayIcon *trayIcon = nil;
  
  JNF_COCOA_ENTER(env);
  
      jobject thePeer = JNFNewGlobalRef(env, peer);
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          trayIcon = [[AWTTrayIcon alloc] initWithPeer:thePeer];
      }];
  
  JNF_COCOA_EXIT(env);
  
*** 332,346 ****
   * Signature: (JLjava/lang/String;)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeSetToolTip
  (JNIEnv *env, jobject self, jlong model, jstring jtooltip) {
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_NOT_APPKIT_THREAD;
  
      AWTTrayIcon *icon = jlong_to_ptr(model);
      NSString *tooltip = JNFJavaToNSString(env, jtooltip);
!     [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
          [icon setTooltip:tooltip];
      }];
  
  JNF_COCOA_EXIT(env);
  }
--- 331,344 ----
   * Signature: (JLjava/lang/String;)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeSetToolTip
  (JNIEnv *env, jobject self, jlong model, jstring jtooltip) {
  JNF_COCOA_ENTER(env);
  
      AWTTrayIcon *icon = jlong_to_ptr(model);
      NSString *tooltip = JNFJavaToNSString(env, jtooltip);
!     [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
          [icon setTooltip:tooltip];
      }];
  
  JNF_COCOA_EXIT(env);
  }
*** 351,364 ****
   * Signature: (JJZ)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_setNativeImage
  (JNIEnv *env, jobject self, jlong model, jlong imagePtr, jboolean autosize) {
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_NOT_APPKIT_THREAD;
  
      AWTTrayIcon *icon = jlong_to_ptr(model);
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          [icon setImage:jlong_to_ptr(imagePtr) sizing:autosize];
      }];
  
  JNF_COCOA_EXIT(env);
  }
--- 349,361 ----
   * Signature: (JJZ)V
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_setNativeImage
  (JNIEnv *env, jobject self, jlong model, jlong imagePtr, jboolean autosize) {
  JNF_COCOA_ENTER(env);
  
      AWTTrayIcon *icon = jlong_to_ptr(model);
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          [icon setImage:jlong_to_ptr(imagePtr) sizing:autosize];
      }];
  
  JNF_COCOA_EXIT(env);
  }
*** 367,383 ****
  Java_sun_lwawt_macosx_CTrayIcon_nativeGetIconLocation
  (JNIEnv *env, jobject self, jlong model) {
      jobject jpt = NULL;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_NOT_APPKIT_THREAD;
  
      __block NSPoint pt = NSZeroPoint;
      AWTTrayIcon *icon = jlong_to_ptr(model);
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
!         AWT_ASSERT_APPKIT_THREAD;
! 
          NSPoint loc = [icon getLocationOnScreen];
          pt = ConvertNSScreenPoint(env, loc);
      }];
  
      jpt = NSToJavaPoint(env, pt);
--- 364,377 ----
  Java_sun_lwawt_macosx_CTrayIcon_nativeGetIconLocation
  (JNIEnv *env, jobject self, jlong model) {
      jobject jpt = NULL;
  
  JNF_COCOA_ENTER(env);
  
      __block NSPoint pt = NSZeroPoint;
      AWTTrayIcon *icon = jlong_to_ptr(model);
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          NSPoint loc = [icon getLocationOnScreen];
          pt = ConvertNSScreenPoint(env, loc);
      }];
  
      jpt = NSToJavaPoint(env, pt);