infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

8071334: Investigate JAB changes required to support the version string change

Browse Source 
Remove use of java.version property; no longer needed

Reviewed-by: van, alexsch
This commit is contained in:
Peter Brunet 2015-12-10 12:16:29 -06:00 committed by Pete Brunet
parent 946e0bc9cc
commit eb2d3e3a7b
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java
View File

@ -48,8 +48,6 @@ import sun.awt.AWTPermissions;
@jdk.Exported
public class AWTEventMonitor {
static private boolean runningOnJDK1_4 = false;
/**
* The current component with keyboard focus.
*
@ -638,15 +636,9 @@ public class AWTEventMonitor {
* @see AWTEventMonitor
*/
public AWTEventsListener() {
String version = System.getProperty("java.version");
if (version != null) {
runningOnJDK1_4 = (version.compareTo("1.4") >= 0);
}
initializeIntrospection();
installListeners();
if (runningOnJDK1_4) {
MenuSelectionManager.defaultManager().addChangeListener(this);
}
MenuSelectionManager.defaultManager().addChangeListener(this);
EventQueueMonitor.addTopLevelWindowListener(this);
}
@ -848,15 +840,7 @@ public class AWTEventMonitor {
case EventID.FOCUS:
c.removeFocusListener(this);
c.addFocusListener(this);
if (runningOnJDK1_4) {
processFocusGained();
} else { // not runningOnJDK1_4
if ((c != componentWithFocus_private) && c.hasFocus()) {
componentWithFocus_private = c;
}
}
processFocusGained();
break;
case EventID.ITEM:

10
jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
View File

@ -140,10 +140,6 @@ final public class AccessBridge {
// initialize AccessibleRole map
initAccessibleRoleMap();
// determine which version of the JDK is running
String version = getJavaVersionProperty();
debugString("JDK version = "+version);
// initialize the methods that map HWNDs and Java top-level
// windows
initHWNDcalls();
@ -215,9 +211,7 @@ final public class AccessBridge {
} catch (Exception e) {}
/*
Build the extendedVirtualNameSearchRoles array list. I chose this method
because some of the Accessible Roles that need to be added to it are not
available in all versions of the J2SE that we want to support.
Build the extendedVirtualNameSearchRoles array list.
*/
extendedVirtualNameSearchRoles.add (AccessibleRole.COMBO_BOX);
try {
@ -5919,7 +5913,7 @@ final public class AccessBridge {
*/
AccessibleRole.UNKNOWN,
// These roles are only available in JDK 1.4
// These roles are available since JDK 1.4
/**
* A STATUS_BAR is an simple component that can contain