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

8212703: Remove sun.java2d.fontpath property from java launcher code

Browse source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Phil Race 2018-12-10 12:33:23 -08:00
parent a5ed4e3e73
commit 8895605e66
6 changed files with 92 additions and 14 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

@ -92,7 +92,6 @@ public final class SystemProps {
putIfAbsent(props, "java.awt.headless", raw.propDefault(Raw._java_awt_headless_NDX));
putIfAbsent(props, "java.awt.graphicsenv", raw.propDefault(Raw._java_awt_graphicsenv_NDX));
putIfAbsent(props, "sun.desktop", raw.propDefault(Raw._sun_desktop_NDX));
putIfAbsent(props, "sun.java2d.fontpath", raw.propDefault(Raw._sun_java2d_fontpath_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));
@ -219,8 +218,7 @@ public final class SystemProps {
@Native private static final int _sun_cpu_isalist_NDX = 1 + _sun_cpu_endian_NDX;
@Native private static final int _sun_desktop_NDX = 1 + _sun_cpu_isalist_NDX;
@Native private static final int _sun_io_unicode_encoding_NDX = 1 + _sun_desktop_NDX;
@Native private static final int _sun_java2d_fontpath_NDX = 1 + _sun_io_unicode_encoding_NDX;
@Native private static final int _sun_jnu_encoding_NDX = 1 + _sun_java2d_fontpath_NDX;
@Native private static final int _sun_jnu_encoding_NDX = 1 + _sun_io_unicode_encoding_NDX;
@Native private static final int _sun_os_patch_level_NDX = 1 + _sun_jnu_encoding_NDX;
@Native private static final int _sun_stderr_encoding_NDX = 1 + _sun_os_patch_level_NDX;
@Native private static final int _sun_stdout_encoding_NDX = 1 + _sun_stderr_encoding_NDX;

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

@ -220,7 +220,6 @@ Java_jdk_internal_util_SystemProps_00024Raw_platformProperties(JNIEnv *env, jcla
* This property may be removed if that mechanism is redesigned
*/
PUTPROP(propArray, _java_awt_graphicsenv_NDX, sprops->graphics_env);
PUTPROP_PlatformString(propArray, _sun_java2d_fontpath_NDX, sprops->font_dir);
/*
* The sun.desktop property is currently only set for Gnome and Windows desktops.

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

@ -46,7 +46,6 @@ typedef struct {
#endif
nchar *tmp_dir;
nchar *font_dir;
nchar *user_dir;
char *file_separator;

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

@ -407,10 +407,6 @@ GetJavaProperties(JNIEnv *env)
sprops.awt_toolkit = "sun.awt.X11.XToolkit";
#endif
/* This is used only for debugging of font problems. */
v = getenv("JAVA2D_FONTPATH");
sprops.font_dir = v ? v : NULL;
#ifdef SI_ISALIST
/* supported instruction sets */
{

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

@ -379,11 +379,6 @@ GetJavaProperties(JNIEnv* env)
/* Java2D properties */
sprops.graphics_env = "sun.awt.Win32GraphicsEnvironment";
{ /* This is used only for debugging of font problems. */
WCHAR *path = _wgetenv(L"JAVA2D_FONTPATH");
sprops.font_dir = (path != NULL) ? _wcsdup(path) : NULL;
}
/* OS properties */
{
char buf[100];