< prev index next >
src/java.desktop/macosx/native/libosxui/AquaFileView.m
Print this page
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
@@ -22,17 +22,16 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-#include <jni_util.h>
+#include <JNIUtilities.h>
#import "com_apple_laf_AquaFileView.h"
#import <sys/param.h> // for MAXPATHLEN
#import <CoreFoundation/CoreFoundation.h>
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
/*
* Class: com_apple_laf_AquaFileView
* Method: getNativePathToRunningJDKBundle
* Signature: ()Ljava/lang/String;
@@ -40,15 +39,15 @@
// TODO: Un-comment this out
/*JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativePathToRunningJDKBundle
(JNIEnv *env, jclass clazz)
{
jstring returnValue = NULL;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
- returnValue = JNFNSToJavaString(env, getRunningJavaBundle());
+ returnValue = NSStringToJavaString(env, getRunningJavaBundle());
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}*/
/*
* Class: com_apple_laf_AquaFileView
@@ -57,15 +56,15 @@
*/
JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativePathToSharedJDKBundle
(JNIEnv *env, jclass clazz)
{
jstring returnValue = NULL;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
- returnValue = JNFNSToJavaString(env, [[NSBundle bundleWithIdentifier:@"com.apple.JavaVM"] bundlePath]);
+ returnValue = NSStringToJavaString(env, [[NSBundle bundleWithIdentifier:@"com.apple.JavaVM"] bundlePath]);
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}
/*
* Class: com_apple_laf_AquaFileView
@@ -74,20 +73,20 @@
*/
JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativeMachineName
(JNIEnv *env, jclass clazz)
{
jstring returnValue = NULL;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
CFStringRef machineName = CSCopyMachineName();
- returnValue = JNFNSToJavaString(env, (NSString*)machineName);
+ returnValue = NSStringToJavaString(env, (NSString*)machineName);
if (machineName != NULL) {
CFRelease(machineName);
}
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}
/*
* Class: com_apple_laf_AquaFileView
@@ -96,11 +95,11 @@
*/
JNIEXPORT jint JNICALL Java_com_apple_laf_AquaFileView_getNativeLSInfo
(JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir)
{
jint returnValue = com_apple_laf_AquaFileView_UNINITALIZED_LS_INFO;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL);
CHECK_NULL_RETURN(byteArray, returnValue);
jsize length = (*env)->GetArrayLength(env, absolutePath);
@@ -124,11 +123,11 @@
if (err == noErr) {
returnValue = itemInfo.flags;
}
}
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}
/*
* Class: com_apple_laf_AquaFileView
@@ -137,11 +136,11 @@
*/
JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativeDisplayName
(JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir)
{
jstring returnValue = NULL;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL);
CHECK_NULL_RETURN(byteArray, returnValue);
jsize length = (*env)->GetArrayLength(env, absolutePath);
@@ -167,20 +166,20 @@
theErr = LSCopyDisplayNameForRef(&ref, &displayName);
if (theErr == noErr) {
CFMutableStringRef mutableDisplayName = CFStringCreateMutableCopy(NULL, 0, displayName);
CFStringNormalize(mutableDisplayName, kCFStringNormalizationFormC);
- returnValue = JNFNSToJavaString(env, (NSString *)mutableDisplayName);
+ returnValue = NSStringToJavaString(env, (NSString *)mutableDisplayName);
CFRelease(mutableDisplayName);
}
if (displayName != NULL) {
CFRelease(displayName);
}
}
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}
/*
* Class: com_apple_laf_AquaFileView
@@ -189,11 +188,11 @@
*/
JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativePathForResolvedAlias
(JNIEnv *env, jclass clazz, jbyteArray pathToAlias, jboolean isDir)
{
jstring returnValue = NULL;
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
UInt8 pathCString[MAXPATHLEN + 1];
size_t maxPathLen = sizeof(pathCString) - 1;
jbyte *byteArray = (*env)->GetByteArrayElements(env, pathToAlias, NULL);
@@ -222,8 +221,8 @@
if (theErr == noErr) {
returnValue = (*env)->NewStringUTF(env, (char *)resolvedPath);
}
}
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
return returnValue;
}
< prev index next >