Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8249215: JFrame::setVisible crashed with -Dfile.encoding=UTF-8 on Japanese Windows. #100

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
Expand Down Expand Up @@ -152,14 +152,18 @@ protected String getFileNameFromComponentFontName(String componentFontName) {

/**
* Returns the component font name (face name plus charset) of the
* font that should be used for AWT text components. May return null.
* font that should be used for AWT text components.
*/
public String getTextComponentFontName(String familyName, int style) {
FontDescriptor[] fontDescriptors = getFontDescriptors(familyName, style);
String fontName = findFontWithCharset(fontDescriptors, textInputCharset);
if (fontName == null) {
if ((fontName == null) && !textInputCharset.equals("DEFAULT_CHARSET")) {
fontName = findFontWithCharset(fontDescriptors, "DEFAULT_CHARSET");
}
if (fontName == null) {
fontName = (fontDescriptors.length > 0) ? fontDescriptors[0].getNativeName()
: "Arial,ANSI_CHARSET";
}
return fontName;
}

Expand Down