src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.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

*** 24,37 ****
   */
  
  #import "CDataTransferer.h"
  #include "sun_lwawt_macosx_CDataTransferer.h"
  
! #import "jni_util.h"
! 
! #import <JavaNativeFoundation/JavaNativeFoundation.h>
! 
  
  // ***** NOTE ***** This dictionary corresponds to the static array predefinedClipboardNames
  // in CDataTransferer.java.
  NSMutableDictionary *sStandardMappings = nil;
  
--- 24,34 ----
   */
  
  #import "CDataTransferer.h"
  #include "sun_lwawt_macosx_CDataTransferer.h"
  
! #import "JNIUtilities.h"
  
  // ***** NOTE ***** This dictionary corresponds to the static array predefinedClipboardNames
  // in CDataTransferer.java.
  NSMutableDictionary *sStandardMappings = nil;
  
*** 107,119 ****
   */
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDataTransferer_registerFormatWithPasteboard
  (JNIEnv *env, jobject jthis, jstring newformat)
  {
      jlong returnValue = -1;
! JNF_COCOA_ENTER(env);
!     returnValue = registerFormatWithPasteboard(JNFJavaToNSString(env, newformat));
! JNF_COCOA_EXIT(env);
      return returnValue;
  }
  
  /*
   * Class:     sun_lwawt_macosx_CDataTransferer
--- 104,116 ----
   */
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDataTransferer_registerFormatWithPasteboard
  (JNIEnv *env, jobject jthis, jstring newformat)
  {
      jlong returnValue = -1;
! JNI_COCOA_ENTER(env);
!     returnValue = registerFormatWithPasteboard(JavaStringToNSString(env, newformat));
! JNI_COCOA_EXIT(env);
      return returnValue;
  }
  
  /*
   * Class:     sun_lwawt_macosx_CDataTransferer
*** 122,134 ****
   */
  JNIEXPORT jstring JNICALL Java_sun_lwawt_macosx_CDataTransferer_formatForIndex
    (JNIEnv *env, jobject jthis, jlong index)
  {
      jstring returnValue = NULL;
! JNF_COCOA_ENTER(env);
!     returnValue = JNFNSToJavaString(env, formatForIndex(index));
! JNF_COCOA_EXIT(env);
      return returnValue;
  }
  
  static jobjectArray CreateJavaFilenameArray(JNIEnv *env, NSArray *filenameArray)
  {
--- 119,131 ----
   */
  JNIEXPORT jstring JNICALL Java_sun_lwawt_macosx_CDataTransferer_formatForIndex
    (JNIEnv *env, jobject jthis, jlong index)
  {
      jstring returnValue = NULL;
! JNI_COCOA_ENTER(env);
!     returnValue = NSStringToJavaString(env, formatForIndex(index));
! JNI_COCOA_EXIT(env);
      return returnValue;
  }
  
  static jobjectArray CreateJavaFilenameArray(JNIEnv *env, NSArray *filenameArray)
  {
*** 136,146 ****
      if (filenameCount == 0) return nil;
  
      // Get the java.lang.String class object:
      jclass stringClazz = (*env)->FindClass(env, "java/lang/String");
      CHECK_NULL_RETURN(stringClazz, nil);
!     jobject jfilenameArray = (*env)->NewObjectArray(env, filenameCount, stringClazz, NULL); // AWT_THREADING Safe (known object)
      if ((*env)->ExceptionOccurred(env)) {
          (*env)->ExceptionDescribe(env);
          (*env)->ExceptionClear(env);
          return nil;
      }
--- 133,143 ----
      if (filenameCount == 0) return nil;
  
      // Get the java.lang.String class object:
      jclass stringClazz = (*env)->FindClass(env, "java/lang/String");
      CHECK_NULL_RETURN(stringClazz, nil);
!     jobject jfilenameArray = (*env)->NewObjectArray(env, filenameCount, stringClazz, NULL);
      if ((*env)->ExceptionOccurred(env)) {
          (*env)->ExceptionDescribe(env);
          (*env)->ExceptionClear(env);
          return nil;
      }
*** 198,208 ****
      // Parse the XML list into strings and return an array of Java strings matching all of the
      // files in the list.
  
      jobjectArray jreturnArray = NULL;
  
! JNF_COCOA_ENTER(env);
      // Get byte array elements:
      jboolean isCopy;
      jbyte* jbytes = (*env)->GetByteArrayElements(env, jbytearray, &isCopy);
      if (jbytes == NULL) {
          return NULL;
--- 195,205 ----
      // Parse the XML list into strings and return an array of Java strings matching all of the
      // files in the list.
  
      jobjectArray jreturnArray = NULL;
  
! JNI_COCOA_ENTER(env);
      // Get byte array elements:
      jboolean isCopy;
      jbyte* jbytes = (*env)->GetByteArrayElements(env, jbytearray, &isCopy);
      if (jbytes == NULL) {
          return NULL;
*** 248,255 ****
  
      [filenameArray release];
  
      // We're done with the jbytes (backing the plist/plistArray):
      (*env)->ReleaseByteArrayElements(env, jbytearray, jbytes, JNI_ABORT);
! JNF_COCOA_EXIT(env);
      return jreturnArray;
  }
--- 245,252 ----
  
      [filenameArray release];
  
      // We're done with the jbytes (backing the plist/plistArray):
      (*env)->ReleaseByteArrayElements(env, jbytearray, jbytes, JNI_ABORT);
! JNI_COCOA_EXIT(env);
      return jreturnArray;
  }