diff options
| author | Denis Fokin <Denis.Fokin@jetbrains.com> | 2017-02-18 11:00:18 +0300 |
|---|---|---|
| committer | Denis Fokin <Denis.Fokin@jetbrains.com> | 2017-02-18 11:00:18 +0300 |
| commit | 3451e66a6c8f74c88aa58bcb300ae488cefd22b6 (patch) | |
| tree | b3237d70aa9589f367d21821bd0d8a87789c56e9 /src | |
| parent | 66450258bdea9d865425d055af55289775b90a6f (diff) | |
| download | jdk8u_jdk-3451e66a6c8f74c88aa58bcb300ae488cefd22b6.tar.gz | |
Temporarily disable the fix because of ARC issuesjb8u112-b744
Diffstat (limited to 'src')
| -rw-r--r-- | src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 5 | ||||
| -rw-r--r-- | src/macosx/native/sun/awt/LWCToolkit.m | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 3fdf0440ce..c546e54e2a 100644 --- a/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -975,10 +975,11 @@ public final class LWCToolkit extends LWToolkit { if (layoutName == null || layoutName.isEmpty()) { throw new RuntimeException("A valid layout ID is expected. Found: " + layoutName); } - switchKeyboardLayoutNative(layoutName); + //switchKeyboardLayoutNative(layoutName); } public static String getKeyboardLayoutId () { - return getKeyboardLayoutNativeId(); + //return getKeyboardLayoutNativeId(); + return ""; } } diff --git a/src/macosx/native/sun/awt/LWCToolkit.m b/src/macosx/native/sun/awt/LWCToolkit.m index 57dbf1274b..b94d6a38ed 100644 --- a/src/macosx/native/sun/awt/LWCToolkit.m +++ b/src/macosx/native/sun/awt/LWCToolkit.m @@ -487,7 +487,7 @@ Java_sun_lwawt_macosx_LWCToolkit_isEmbedded * Method: getKeyboardLayoutNativeId * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL +/*JNIEXPORT jstring JNICALL JNICALL Java_sun_lwawt_macosx_LWCToolkit_getKeyboardLayoutNativeId(JNIEnv *env, jclass cls) { JNF_COCOA_ENTER(env); @@ -498,14 +498,14 @@ __block NSString * layoutId; }]; return JNFNSToJavaString(env, layoutId); JNF_COCOA_EXIT(env); -} +}*/ /* * Class: sun_lwawt_macosx_LWCToolkit * Method: switchKeyboardLayoutNative * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL +/*JNIEXPORT void JNICALL JNICALL Java_sun_lwawt_macosx_LWCToolkit_switchKeyboardLayoutNative(JNIEnv *env, jclass cls, jstring jLayoutId) { JNF_COCOA_ENTER(env); @@ -524,4 +524,4 @@ __block NSString* layoutId = [JNFJavaToNSString(env, jLayoutId) retain]; [layoutId release]; }]; JNF_COCOA_EXIT(env); -}
\ No newline at end of file +}*/
\ No newline at end of file |