src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h

rev 54094 : 8257853: Remove dependencies on JNF's JNI utility functions in AWT and 2D code
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

@@ -21,29 +21,21 @@
  * 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 <JavaNativeFoundation/JavaNativeFoundation.h>
+#import "JNIUtilities.h"
 
 extern NSString *const JavaAccessibilityIgnore;
 
 extern NSMutableDictionary *sRoles;
 extern void initializeRoles();
 
-extern JNFClassInfo sjc_CAccessibility;
-extern JNFClassInfo sjc_AccessibleComponent;
-extern JNFClassInfo sjc_AccessibleContext;
-extern JNFClassInfo sjc_Accessible;
-extern JNFClassInfo sjc_AccessibleRole;
-extern JNFClassInfo sjc_Point;
-extern JNFClassInfo sjc_AccessibleText;
-
-extern JNFMemberInfo *sjm_getAccessibleRole;
-extern JNFMemberInfo *sjf_key;
-extern JNFMemberInfo *sjf_X;
-extern JNFMemberInfo *sjf_Y;
+#define GET_CACCESSIBILITY_CLASS() \
+    GET_CLASS(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility");
+#define GET_CACCESSIBILITY_CLASS_RETURN(ret) \
+    GET_CLASS_RETURN(sjc_CAccessibility, "sun/lwawt/macosx/CAccessibility", ret);
 
 NSSize getAxComponentSize(JNIEnv *env, jobject axComponent, jobject component);
 NSString *getJavaRole(JNIEnv *env, jobject axComponent, jobject component);
 jobject getAxSelection(JNIEnv *env, jobject axContext, jobject component);
 jobject getAxContextSelection(JNIEnv *env, jobject axContext, jint index, jobject component);