< prev index next >
src/java.desktop/unix/classes/sun/awt/X11FontManager.java
Print this page
rev 59383 : [mq]: final
*** 1,7 ****
/*
! * Copyright (c) 2009, 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) 2009, 2020, 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
*** 706,717 ****
* use the preconfigured file.
* If synthesising fails, we fall back to any preconfigured file
* and do the best we can.
*/
FontConfiguration mFontConfig = new MFontConfiguration(this);
! if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile()) ||
! (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent())) {
FcFontConfiguration fcFontConfig =
new FcFontConfiguration(this);
if (fcFontConfig.init()) {
return fcFontConfig;
}
--- 706,716 ----
* use the preconfigured file.
* If synthesising fails, we fall back to any preconfigured file
* and do the best we can.
*/
FontConfiguration mFontConfig = new MFontConfiguration(this);
! if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile())) {
FcFontConfiguration fcFontConfig =
new FcFontConfiguration(this);
if (fcFontConfig.init()) {
return fcFontConfig;
}
< prev index next >