src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java

*** 84,93 ****
--- 84,102 ----
              return LWCToolkit.invokeAndWait(callable, c);
          } catch (final Exception e) { e.printStackTrace(); }
          return null;
      }
  
+     static <T> T invokeAndWait(final Callable<T> callable, final Component c, final T defValue) {
+         T value = null;
+         try {
+             value = LWCToolkit.invokeAndWait(callable, c);
+         } catch (final Exception e) { e.printStackTrace(); }
+ 
+         return value != null ? value : defValue;
+     }
+ 
      static void invokeLater(final Runnable runnable, final Component c) {
          try {
              LWCToolkit.invokeLater(runnable, c);
          } catch (InvocationTargetException e) { e.printStackTrace(); }
      }
*** 179,189 ****
                  final AccessibleSelection as = ac.getAccessibleSelection();
                  if (as == null) return Boolean.FALSE;
  
                  return as.isAccessibleChildSelected(index);
              }
!         }, c);
      }
  
      public static AccessibleStateSet getAccessibleStateSet(final AccessibleContext ac, final Component c) {
          if (ac == null) return null;
  
--- 188,198 ----
                  final AccessibleSelection as = ac.getAccessibleSelection();
                  if (as == null) return Boolean.FALSE;
  
                  return as.isAccessibleChildSelected(index);
              }
!         }, c, false);
      }
  
      public static AccessibleStateSet getAccessibleStateSet(final AccessibleContext ac, final Component c) {
          if (ac == null) return null;
  
*** 201,211 ****
              public Boolean call() throws Exception {
                  final AccessibleStateSet ass = ac.getAccessibleStateSet();
                  if (ass == null) return null;
                  return ass.contains(as);
              }
!         }, c);
      }
  
      static String getAccessibleRoleFor(final Accessible a) {
          final AccessibleContext ac = a.getAccessibleContext();
          if (ac == null) return null;
--- 210,220 ----
              public Boolean call() throws Exception {
                  final AccessibleStateSet ass = ac.getAccessibleStateSet();
                  if (ass == null) return null;
                  return ass.contains(as);
              }
!         }, c, false);
      }
  
      static String getAccessibleRoleFor(final Accessible a) {
          final AccessibleContext ac = a.getAccessibleContext();
          if (ac == null) return null;
*** 246,256 ****
  
          return invokeAndWait(new Callable<Integer>() {
              public Integer call() throws Exception {
                  return at.getCharCount();
              }
!         }, c);
      }
  
      // Accessibility Threadsafety for JavaComponentAccessibility.m
      public static Accessible getAccessibleParent(final Accessible a, final Component c) {
          if (a == null) return null;
--- 255,265 ----
  
          return invokeAndWait(new Callable<Integer>() {
              public Integer call() throws Exception {
                  return at.getCharCount();
              }
!         }, c, 0);
      }
  
      // Accessibility Threadsafety for JavaComponentAccessibility.m
      public static Accessible getAccessibleParent(final Accessible a, final Component c) {
          if (a == null) return null;
*** 271,281 ****
              public Integer call() throws Exception {
                  final AccessibleContext ac = a.getAccessibleContext();
                  if (ac == null) return null;
                  return ac.getAccessibleIndexInParent();
              }
!         }, c);
      }
  
      public static AccessibleComponent getAccessibleComponent(final Accessible a, final Component c) {
          if (a == null) return null;
  
--- 280,290 ----
              public Integer call() throws Exception {
                  final AccessibleContext ac = a.getAccessibleContext();
                  if (ac == null) return null;
                  return ac.getAccessibleIndexInParent();
              }
!         }, c, -1);
      }
  
      public static AccessibleComponent getAccessibleComponent(final Accessible a, final Component c) {
          if (a == null) return null;
  
*** 367,377 ****
                  final AccessibleComponent aComp = ac.getAccessibleComponent();
                  if (aComp == null) return null;
  
                  return aComp.isFocusTraversable();
              }
!         }, c);
      }
  
      public static Accessible accessibilityHitTest(final Container parent, final float hitPointX, final float hitPointY) {
          return invokeAndWait(new Callable<Accessible>() {
              public Accessible call() throws Exception {
--- 376,386 ----
                  final AccessibleComponent aComp = ac.getAccessibleComponent();
                  if (aComp == null) return null;
  
                  return aComp.isFocusTraversable();
              }
!         }, c, false);
      }
  
      public static Accessible accessibilityHitTest(final Container parent, final float hitPointX, final float hitPointY) {
          return invokeAndWait(new Callable<Accessible>() {
              public Accessible call() throws Exception {
*** 426,436 ****
                  final AccessibleComponent aComp = ac.getAccessibleComponent();
                  if (aComp == null) return null;
  
                  return aComp.isEnabled();
              }
!         }, c);
      }
  
      // KCH - can we make this a postEvent instead?
      public static void requestFocus(final Accessible a, final Component c) {
          if (a == null) return;
--- 435,445 ----
                  final AccessibleComponent aComp = ac.getAccessibleComponent();
                  if (aComp == null) return null;
  
                  return aComp.isEnabled();
              }
!         }, c, false);
      }
  
      // KCH - can we make this a postEvent instead?
      public static void requestFocus(final Accessible a, final Component c) {
          if (a == null) return;