archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8212700: Change the mechanism by which JDK loads the platform-specific AWT Toolkit

Browse source 
Reviewed-by: serb, rriggs
This commit is contained in:
Phil Race 2019-05-10 16:22:35 -07:00
parent 7f841d6d9a
commit 8ca1211aab
13 changed files with 95 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/jdk/internal/util/SystemProps.java
View file

@ -90,7 +90,6 @@ public final class SystemProps {
putIfAbsent(props, "http.nonProxyHosts", raw.propDefault(Raw._http_nonProxyHosts_NDX));
putIfAbsent(props, "ftp.nonProxyHosts", raw.propDefault(Raw._ftp_nonProxyHosts_NDX));
putIfAbsent(props, "socksNonProxyHosts", raw.propDefault(Raw._socksNonProxyHosts_NDX));
putIfAbsent(props, "awt.toolkit", raw.propDefault(Raw._awt_toolkit_NDX));
putIfAbsent(props, "sun.arch.abi", raw.propDefault(Raw._sun_arch_abi_NDX));
putIfAbsent(props, "sun.arch.data.model", raw.propDefault(Raw._sun_arch_data_model_NDX));
putIfAbsent(props, "sun.os.patch.level", raw.propDefault(Raw._sun_os_patch_level_NDX));
@ -185,8 +184,7 @@ public final class SystemProps {
public static class Raw {
// Array indices written by native vmProperties()
// The order is arbitrary (but alphabetic for convenience)
@Native private static final int _awt_toolkit_NDX = 0;
@Native private static final int _display_country_NDX = 1 + _awt_toolkit_NDX;
@Native private static final int _display_country_NDX = 0;
@Native private static final int _display_language_NDX = 1 + _display_country_NDX;
@Native private static final int _display_script_NDX = 1 + _display_language_NDX;
@Native private static final int _display_variant_NDX = 1 + _display_script_NDX;

2
src/java.base/share/native/libjava/System.c
View file

@ -204,8 +204,6 @@ Java_jdk_internal_util_SystemProps_00024Raw_platformProperties(JNIEnv *env, jcla
/* patch level */
PUTPROP(propArray, _sun_os_patch_level_NDX, sprops->patch_level);
PUTPROP(propArray, _awt_toolkit_NDX, sprops->awt_toolkit);
PUTPROP_PlatformString(propArray, _java_io_tmpdir_NDX, sprops->tmp_dir);
PUTPROP_PlatformString(propArray, _user_name_NDX, sprops->user_name);

2
src/java.base/share/native/libjava/java_props.h
View file

@ -68,8 +68,6 @@ typedef struct {
char *sun_stdout_encoding;
char *sun_stderr_encoding;
char *awt_toolkit;
char *unicode_encoding; /* The default endianness of unicode
i.e. UnicodeBig or UnicodeLittle */

8
src/java.base/unix/native/libjava/java_props_md.c
View file

@ -394,14 +394,6 @@ GetJavaProperties(JNIEnv *env)
/* patches/service packs installed */
sprops.patch_level = NULL; // leave it undefined
/* Java 2D/AWT properties */
#ifdef MACOSX
// Always the same Toolkit on Mac OS X
sprops.awt_toolkit = "sun.lwawt.macosx.LWCToolkit";
#else
sprops.awt_toolkit = "sun.awt.X11.XToolkit";
#endif
#ifdef SI_ISALIST
/* supported instruction sets */
{

3
src/java.base/windows/native/libjava/java_props_md.c
View file

@ -365,9 +365,6 @@ GetJavaProperties(JNIEnv* env)
return &sprops;
}
/* AWT properties */
sprops.awt_toolkit = "sun.awt.windows.WToolkit";
/* tmp dir */
{
WCHAR tmpdir[MAX_PATH + 1];