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

*** 151,161 ****
      if (!inputMethodController) return NULL;
      jobject returnValue = 0;
      __block NSString *keyboardInfo = NULL;
  JNF_COCOA_ENTER(env);
  
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          keyboardInfo = [inputMethodController performSelector:@selector(currentInputMethodName)];
          [keyboardInfo retain];
      }];
  
      if (keyboardInfo == nil) return NULL;
--- 151,161 ----
      if (!inputMethodController) return NULL;
      jobject returnValue = 0;
      __block NSString *keyboardInfo = NULL;
  JNF_COCOA_ENTER(env);
  
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          keyboardInfo = [inputMethodController performSelector:@selector(currentInputMethodName)];
          [keyboardInfo retain];
      }];
  
      if (keyboardInfo == nil) return NULL;
*** 175,185 ****
  (JNIEnv *env, jobject this, jlong nativePeer, jobject inputMethod)
  {
  JNF_COCOA_ENTER(env);
      AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
      JNFJObjectWrapper *inputMethodWrapper = [[JNFJObjectWrapper alloc] initWithJObject:inputMethod withEnv:env];
!     [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
          [CInputMethod _nativeNotifyPeerWithView:view inputMethod:inputMethodWrapper];
      }];
  
  JNF_COCOA_EXIT(env);
  
--- 175,185 ----
  (JNIEnv *env, jobject this, jlong nativePeer, jobject inputMethod)
  {
  JNF_COCOA_ENTER(env);
      AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
      JNFJObjectWrapper *inputMethodWrapper = [[JNFJObjectWrapper alloc] initWithJObject:inputMethod withEnv:env];
!     [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
          [CInputMethod _nativeNotifyPeerWithView:view inputMethod:inputMethodWrapper];
      }];
  
  JNF_COCOA_EXIT(env);
  
*** 194,204 ****
  (JNIEnv *env, jobject this, jlong nativePeer)
  {
  JNF_COCOA_ENTER(env);
     AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
  
!    [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
          [CInputMethod _nativeEndComposition:view];
      }];
  
  JNF_COCOA_EXIT(env);
  }
--- 194,204 ----
  (JNIEnv *env, jobject this, jlong nativePeer)
  {
  JNF_COCOA_ENTER(env);
     AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
  
!    [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
          [CInputMethod _nativeEndComposition:view];
      }];
  
  JNF_COCOA_EXIT(env);
  }
*** 214,224 ****
      if (!inputMethodController) return NULL;
      jobject returnValue = 0;
      __block NSString *isoAbbreviation;
  JNF_COCOA_ENTER(env);
  
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          isoAbbreviation = (NSString *) [inputMethodController performSelector:@selector(currentInputMethodLocale)];
          [isoAbbreviation retain];
      }];
  
      if (isoAbbreviation == nil) return NULL;
--- 214,224 ----
      if (!inputMethodController) return NULL;
      jobject returnValue = 0;
      __block NSString *isoAbbreviation;
  JNF_COCOA_ENTER(env);
  
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          isoAbbreviation = (NSString *) [inputMethodController performSelector:@selector(currentInputMethodLocale)];
          [isoAbbreviation retain];
      }];
  
      if (isoAbbreviation == nil) return NULL;
*** 257,267 ****
  {
  JNF_COCOA_ENTER(env);
      NSString *localeStr = JNFJavaToNSString(env, locale);
      [localeStr retain];
  
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          [CInputMethod setKeyboardLayout:localeStr];
      }];
  
      [localeStr release];
  JNF_COCOA_EXIT(env);
--- 257,267 ----
  {
  JNF_COCOA_ENTER(env);
      NSString *localeStr = JNFJavaToNSString(env, locale);
      [localeStr retain];
  
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          [CInputMethod setKeyboardLayout:localeStr];
      }];
  
      [localeStr release];
  JNF_COCOA_EXIT(env);
*** 291,301 ****
      jobject returnValue = 0;
  
      __block NSArray *selectableArray = nil;
  JNF_COCOA_ENTER(env);
  
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          selectableArray = (NSArray *)[inputMethodController performSelector:@selector(availableInputMethodLocales)];
          [selectableArray retain];
      }];
  
      if (selectableArray == nil) return NULL;
--- 291,301 ----
      jobject returnValue = 0;
  
      __block NSArray *selectableArray = nil;
  JNF_COCOA_ENTER(env);
  
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          selectableArray = (NSArray *)[inputMethodController performSelector:@selector(availableInputMethodLocales)];
          [selectableArray retain];
      }];
  
      if (selectableArray == nil) return NULL;