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

@@ -21,12 +21,14 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
+#import "JNIUtilities.h"
+#import "ThreadUtilities.h"
+
 #import <Cocoa/Cocoa.h>
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
 
 #import "sun_lwawt_macosx_CFRetainedResource.h"
 
 
 /*

@@ -45,19 +47,19 @@
             [NSApp postRunnableEvent:^() {
                 CFRelease(jlong_to_ptr(ptr));
             }];
         } else {
             // could happen if we are embedded inside SWT/FX application,
-            [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^() {
+            [ThreadUtilities performOnMainThreadWaiting:NO block:^() {
                 CFRelease(jlong_to_ptr(ptr));
             }];
         }
     } else {
 
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
 
         CFRelease(jlong_to_ptr(ptr));
 
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
 
     }
 }