RFR(S) Backport: 8213213: Remove src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h

[Hohensee, Paul]

Looks good.

Paul

On 5/15/19, 12:07 AM, "jdk8u-dev on behalf of Langer, Christoph" <jdk8u-dev-bounces at openjdk.java.net on behalf of christoph.langer at sap.com> wrote:

    Hi,
    
    please review this simple backport of a cleanup change for awt/X11.
    
    The patch failed on this hunk:
    
    --- XKeysym.java
    +++ XKeysym.java
    @@ -33,15 +44,6 @@
     public class XKeysym {
    -    public static void main( String[] args ) {
    -       System.out.println( "Cyrillc zhe:"+convertKeysym(0x06d6, 0));
    -       System.out.println( "Arabic sheen:"+convertKeysym(0x05d4, 0));
    -       System.out.println( "Latin a breve:"+convertKeysym(0x01e3, 0));
    -       System.out.println( "Latin f:"+convertKeysym(0x066, 0));
    -       System.out.println( "Backspace:"+Integer.toHexString(convertKeysym(0xff08, 0)));
    -       System.out.println( "Ctrl+f:"+Integer.toHexString(convertKeysym(0x066, XConstants.ControlMask)));
    -    }
    -
         private XKeysym() {}
         static class Keysym2JavaKeycode  {
    
    The signature of main had been changed by JDK-8211300 which isn’t downported. So I deleted the main method manually to resolve ��
    
    It also failed to delete src/solaris/classes/sun/awt/X11/keysym2ucs.h.rej because the existing file of jdk8 obviously had diffs to the upstream version. I deleted it nevertheless.
    
    The change of src/java.desktop/unix/legal/xwindows.md moved to THIRD_PARTY_README. This part of the change I’ll have to push to all sub-repos of the 8u forest.
    
    Webrev: http://cr.openjdk.java.net/~clanger/webrevs/8213213.8u.jdk/
    Original Bug: https://bugs.openjdk.java.net/browse/JDK-8213213
    
    Thanks
    Christoph