src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2011, 2014, 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. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2011, 2015, 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. Oracle designates this
*** 291,301 **** targetCreatedPeer(target, peer); return peer; } @Override ! protected DesktopPeer createDesktopPeer(Desktop target) { return new CDesktopPeer(); } @Override public LWCursorManager getCursorManager() { --- 291,301 ---- targetCreatedPeer(target, peer); return peer; } @Override ! public DesktopPeer createDesktopPeer(Desktop target) { return new CDesktopPeer(); } @Override public LWCursorManager getCursorManager() {
*** 348,357 **** --- 348,358 ---- // Follow up for real implementation return (char)0xfff8; // see http://developer.apple.com/fonts/LastResortFont/ } } @Override + @SuppressWarnings("deprecation") public FontPeer getFontPeer(String name, int style) { return new OSXPlatformFont(name, style); } @Override
*** 573,583 **** public static boolean doEquals(final Object a, final Object b, Component c) { if (a == b) return true; final boolean[] ret = new boolean[1]; ! try { invokeAndWait(new Runnable() { public void run() { synchronized(ret) { ret[0] = a.equals(b); }}}, c); } catch (Exception e) { e.printStackTrace(); } synchronized(ret) { return ret[0]; } } --- 574,585 ---- public static boolean doEquals(final Object a, final Object b, Component c) { if (a == b) return true; final boolean[] ret = new boolean[1]; ! try { invokeAndWait(new Runnable() { @Override ! public void run() { synchronized(ret) { ret[0] = a.equals(b); }}}, c); } catch (Exception e) { e.printStackTrace(); } synchronized(ret) { return ret[0]; } }