Find xprop at runtime instead of checking the path in the configure.ac

Author: tanya011

make/autoconf/configure.ac

@@ -247,23 +247,6 @@ JVM_FEATURES_SETUP
 
 HOTSPOT_SETUP_MISC
 
-###############################################################################
-#
-# Configuration for Java ATK Wrapper.
-#
-###############################################################################
-
-XPROP_PATH=${PATH}:/usr/X11/bin
-AC_PATH_PROG(XPROP,xprop,,${XPROP_PATH})
-if test -z "$XPROP"; then
-  AC_MSG_ERROR([No xprop found])
-fi
-AC_SUBST(XPROP)
-
-AC_CONFIG_FILES([
-  src/jdk.accessibility/linux/classes/org/GNOME/Accessibility/AtkWrapper.java
-])
-
 ###############################################################################
 #
 # We need to do some final tweaking, when everything else is done.

…g/GNOME/Accessibility/AtkWrapper.java.in …/org/GNOME/Accessibility/AtkWrapper.javasrc/jdk.accessibility/linux/classes/org/GNOME/Accessibility/AtkWrapper.java.in renamed to src/jdk.accessibility/linux/classes/org/GNOME/Accessibility/AtkWrapper.java src/jdk.accessibility/linux/classes/org/GNOME/Accessibility/AtkWrapper.java.in renamed to src/jdk.accessibility/linux/classes/org/GNOME/Accessibility/AtkWrapper.java

@@ -29,6 +29,7 @@
 import javax.management.*;
 import javax.swing.JComboBox;
 import java.lang.management.*;
+import java.util.*;
 
 public class AtkWrapper {
   static boolean accessibilityEnabled = false;
@@ -37,9 +38,29 @@ static void initAtk() {
     if (AtkWrapper.initNativeLibrary())
       accessibilityEnabled = true;
   }
+
+  private static String findXPropPath() {
+    String pathEnv = System.getenv().get("PATH");
+    if (pathEnv != null) {
+      String pathSeparator = File.pathSeparator;
+      java.util.List<String> paths = Arrays.asList(pathEnv.split(File.pathSeparator));
+      for (String path : paths) {
+        File xpropFile = new File(path, "xprop");
+        if (xpropFile.exists()) {
+          return xpropFile.getAbsolutePath();
+        }
+      }
+    }
+    return null;
+  }
+
   static {
     try {
-      ProcessBuilder builder = new ProcessBuilder("@XPROP@", "-root");
+      String xpropPath = findXPropPath();
+      if (xpropPath == null) {
+        throw new RuntimeException("No xprop found");
+      }
+      ProcessBuilder builder = new ProcessBuilder(xpropPath, "-root");
       Process p = builder.start();
       BufferedReader b = new BufferedReader(new InputStreamReader (p.getInputStream ()));
       String result;
@@ -690,7 +711,7 @@ public AtkWrapper() {
                                 AWTEvent.WINDOW_EVENT_MASK |
                                 AWTEvent.FOCUS_EVENT_MASK |
                                 AWTEvent.CONTAINER_EVENT_MASK);
-
+    if (toolkit.getSystemEventQueue() != null) {
     toolkit.getSystemEventQueue().push(new EventQueue() {
       boolean previousPressConsumed = false;
 
@@ -719,6 +740,7 @@ public void dispatchEvent(AWTEvent e) {
         super.dispatchEvent(e);
       }
     });
+    }
   }
 
   public static long getInstanceFromSwing(AccessibleContext ac) {
@@ -728,4 +750,4 @@ public static long getInstanceFromSwing(AccessibleContext ac) {
   public static void main(String args[]) {
     new AtkWrapper();
   }
-}
+}