--- old/src/macosx/native/sun/awt/AWTView.m 2016-07-04 12:29:29.000000000 +0400 +++ new/src/macosx/native/sun/awt/AWTView.m 2016-07-04 12:29:29.000000000 +0400 @@ -536,8 +536,10 @@ } -(BOOL) isCodePointInUnicodeBlockNeedingIMEvent: (unichar) codePoint { - if ((codePoint >= 0x3000) && (codePoint <= 0x303F)) { - // Code point is in 'CJK Symbols and Punctuation' Unicode block. + if (((codePoint >= 0x3000) && (codePoint <= 0x303F)) || + ((codePoint >= 0xFF00) && (codePoint <= 0xFFEF))) { + // Code point is in 'CJK Symbols and Punctuation' or + // 'Halfwidth and Fullwidth Forms' Unicode block. return YES; } return NO; --- /dev/null 2016-07-04 12:29:30.000000000 +0400 +++ new/test/java/awt/im/8148984/bug8148984.html 2016-07-04 12:29:29.000000000 +0400 @@ -0,0 +1,38 @@ + + + + +Verify that Chinese comma can be entered in JTextField with Pinyin input method (IM). + +This test is for OS X only. For other platforms please simply press "Pass". + +1. Go to "System Preferences -> Keyboard -> Input Sources" and add "Pinyin – Traditional" or "Pinyin – Simplified" IM from Chinese language group. +2. Set current IM to "Pinyin". +3. Set focus to the text field of the test and press "comma" character on the keyboard. +4. Set current IM to the IM used before "Pinyin" was set. +5. If "，" character is displayed in the text area, press "Pass", if "," character is displayed, press "Fail". + + + + --- /dev/null 2016-07-04 12:29:30.000000000 +0400 +++ new/test/java/awt/im/8148984/bug8148984.java 2016-07-04 12:29:30.000000000 +0400 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * 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. + */ + +/* @test + * @bug 8148984 + * @summary Chinese Comma cannot be entered using Pinyin Input Method on OS X + * @author Dmitry Markov + * @run applet/manual=yesno bug8148984.html + */ + +import javax.swing.*; + +public class bug8148984 extends JApplet { + @Override + public void init() { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + JPanel panel = new JPanel(); + panel.add(new JLabel("Text field:")); + panel.add(new JTextField(20)); + add(panel); + } + }); + } +} +