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

8212701: remove sun.desktop property from launcher code

Browse source 
Reviewed-by: serb, alanb, rriggs
This commit is contained in:
Phil Race 2019-04-24 09:21:02 -07:00
parent f7d8bb2c70
commit e3e016b54c
11 changed files with 60 additions and 27 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

@ -93,7 +93,6 @@ public final class SystemProps {
putIfAbsent(props, "awt.toolkit", raw.propDefault(Raw._awt_toolkit_NDX));
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.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));
@ -222,8 +221,7 @@ public final class SystemProps {
@Native private static final int _sun_arch_data_model_NDX = 1 + _sun_arch_abi_NDX;
@Native private static final int _sun_cpu_endian_NDX = 1 + _sun_arch_data_model_NDX;
@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_io_unicode_encoding_NDX = 1 + _sun_cpu_isalist_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;

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

@ -221,11 +221,6 @@ Java_jdk_internal_util_SystemProps_00024Raw_platformProperties(JNIEnv *env, jcla
*/
PUTPROP(propArray, _java_awt_graphicsenv_NDX, sprops->graphics_env);
/*
* The sun.desktop property is currently only set for Gnome and Windows desktops.
*/
PUTPROP(propArray, _sun_desktop_NDX, sprops->desktop);
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

@ -82,8 +82,6 @@ typedef struct {
char *patch_level; /* patches/service packs installed */
char *desktop; /* Desktop name. */
#ifdef MACOSX
// These are for proxy-related information.
// Note that if these platform-specific extensions get out of hand we should make a new

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

@ -452,13 +452,6 @@ GetJavaProperties(JNIEnv *env)
#endif /* MACOSX */
sprops.os_arch = ARCHPROPNAME;
if (getenv("GNOME_DESKTOP_SESSION_ID") != NULL) {
sprops.desktop = "gnome";
}
else {
sprops.desktop = NULL;
}
}
/* ABI property (optional) */

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

@ -577,7 +577,6 @@ GetJavaProperties(JNIEnv* env)
#else
sprops.os_arch = "unknown";
#endif
sprops.desktop = "windows";
}
/* Endianness of platform */