src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m

rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

*** 25,37 ****
  
  #import "java_awt_event_InputEvent.h"
  #import "java_awt_event_KeyEvent.h"
  #import "LWCToolkit.h"
  
! #import "jni_util.h"
  
- #import <JavaNativeFoundation/JavaNativeFoundation.h>
  #import <sys/time.h>
  #import <Carbon/Carbon.h>
  
  /*
   * Table to map typed characters to their Java virtual key equivalent and back.
--- 25,36 ----
  
  #import "java_awt_event_InputEvent.h"
  #import "java_awt_event_KeyEvent.h"
  #import "LWCToolkit.h"
  
! #import "JNIUtilities.h"
  
  #import <sys/time.h>
  #import <Carbon/Carbon.h>
  
  /*
   * Table to map typed characters to their Java virtual key equivalent and back.
*** 673,687 ****
  Java_sun_lwawt_macosx_NSEvent_nsToJavaModifiers
  (JNIEnv *env, jclass cls, jint modifierFlags)
  {
      jint jmodifiers = 0;
  
! JNF_COCOA_ENTER(env);
  
      jmodifiers = GetJavaMouseModifiers(modifierFlags);
  
! JNF_COCOA_EXIT(env);
  
      return jmodifiers;
  }
  
  /*
--- 672,686 ----
  Java_sun_lwawt_macosx_NSEvent_nsToJavaModifiers
  (JNIEnv *env, jclass cls, jint modifierFlags)
  {
      jint jmodifiers = 0;
  
! JNI_COCOA_ENTER(env);
  
      jmodifiers = GetJavaMouseModifiers(modifierFlags);
  
! JNI_COCOA_EXIT(env);
  
      return jmodifiers;
  }
  
  /*
*** 693,703 ****
  Java_sun_lwawt_macosx_NSEvent_nsToJavaKeyInfo
  (JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
  {
      BOOL postsTyped = NO;
  
! JNF_COCOA_ENTER(env);
  
      jboolean copy = JNI_FALSE;
      jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
      CHECK_NULL_RETURN(data, postsTyped);
  
--- 692,702 ----
  Java_sun_lwawt_macosx_NSEvent_nsToJavaKeyInfo
  (JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
  {
      BOOL postsTyped = NO;
  
! JNI_COCOA_ENTER(env);
  
      jboolean copy = JNI_FALSE;
      jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
      CHECK_NULL_RETURN(data, postsTyped);
  
*** 721,731 ****
      (*env)->SetIntArrayRegion(env, outData, 1, 1, &jkeyLocation);
      (*env)->SetIntArrayRegion(env, outData, 2, 1, &testDeadChar);
  
      (*env)->ReleaseIntArrayElements(env, inData, data, 0);
  
! JNF_COCOA_EXIT(env);
  
      return postsTyped;
  }
  
  /*
--- 720,730 ----
      (*env)->SetIntArrayRegion(env, outData, 1, 1, &jkeyLocation);
      (*env)->SetIntArrayRegion(env, outData, 2, 1, &testDeadChar);
  
      (*env)->ReleaseIntArrayElements(env, inData, data, 0);
  
! JNI_COCOA_EXIT(env);
  
      return postsTyped;
  }
  
  /*
*** 735,745 ****
   */
  JNIEXPORT void JNICALL
  Java_sun_lwawt_macosx_NSEvent_nsKeyModifiersToJavaKeyInfo
  (JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
  {
! JNF_COCOA_ENTER(env);
  
      jboolean copy = JNI_FALSE;
      jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
      CHECK_NULL(data);
  
--- 734,744 ----
   */
  JNIEXPORT void JNICALL
  Java_sun_lwawt_macosx_NSEvent_nsKeyModifiersToJavaKeyInfo
  (JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
  {
! JNI_COCOA_ENTER(env);
  
      jboolean copy = JNI_FALSE;
      jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
      CHECK_NULL(data);
  
*** 762,772 ****
      (*env)->SetIntArrayRegion(env, outData, 1, 1, &jkeyLocation);
      (*env)->SetIntArrayRegion(env, outData, 2, 1, &jkeyType);
  
      (*env)->ReleaseIntArrayElements(env, inData, data, 0);
  
! JNF_COCOA_EXIT(env);
  }
  
  /*
   * Class:     sun_lwawt_macosx_NSEvent
   * Method:    nsToJavaChar
--- 761,771 ----
      (*env)->SetIntArrayRegion(env, outData, 1, 1, &jkeyLocation);
      (*env)->SetIntArrayRegion(env, outData, 2, 1, &jkeyType);
  
      (*env)->ReleaseIntArrayElements(env, inData, data, 0);
  
! JNI_COCOA_EXIT(env);
  }
  
  /*
   * Class:     sun_lwawt_macosx_NSEvent
   * Method:    nsToJavaChar
*** 776,788 ****
  Java_sun_lwawt_macosx_NSEvent_nsToJavaChar
  (JNIEnv *env, jclass cls, jchar nsChar, jint modifierFlags, jboolean spaceKeyTyped)
  {
      jchar javaChar = 0;
  
! JNF_COCOA_ENTER(env);
  
      javaChar = NsCharToJavaChar(nsChar, modifierFlags, spaceKeyTyped);
  
! JNF_COCOA_EXIT(env);
  
      return javaChar;
  }
--- 775,787 ----
  Java_sun_lwawt_macosx_NSEvent_nsToJavaChar
  (JNIEnv *env, jclass cls, jchar nsChar, jint modifierFlags, jboolean spaceKeyTyped)
  {
      jchar javaChar = 0;
  
! JNI_COCOA_ENTER(env);
  
      javaChar = NsCharToJavaChar(nsChar, modifierFlags, spaceKeyTyped);
  
! JNI_COCOA_EXIT(env);
  
      return javaChar;
  }