jdk-sandbox: comparison jdk/src/java.desktop/macosx/native/libawt

equal deleted inserted replaced

-:088180ff66b9
+:76907ae1b680
 {
 AWT_ASSERT_APPKIT_THREAD;
 NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
 }
-- (void)postSelectionChanged
+- (void)postSelectedTextChanged
 {
 AWT_ASSERT_APPKIT_THREAD;
 NSAccessibilityPostNotification(self, NSAccessibilitySelectedTextChangedNotification);
 }
+- (void)postSelectionChanged
+{
+AWT_ASSERT_APPKIT_THREAD;
+NSAccessibilityPostNotification(self, NSAccessibilitySelectedChildrenChangedNotification);
+}
 - (BOOL)isEqual:(id)anObject
 {
 if (![anObject isKindOfClass:[self class]]) return NO;
 JavaComponentAccessibility *accessibility = (JavaComponentAccessibility *)anObject;
 + (void)initialize
 {
 if (sAttributeNamesForRoleCache == nil) {
 sAttributeNamesLOCK = [[NSObject alloc] init];
-sAttributeNamesForRoleCache = [[NSMutableDictionary alloc] initWithCapacity:10];
+sAttributeNamesForRoleCache = [[NSMutableDictionary alloc] initWithCapacity:60];
 }
 if (sRoles == nil) {
 initializeRoles();
 }
 return NULL;
 }
 + (NSArray *)childrenOfParent:(JavaComponentAccessibility *)parent withEnv:(JNIEnv *)env withChildrenCode:(NSInteger)whichChildren allowIgnored:(BOOL)allowIgnored
 {
+if (parent->fAccessible == NULL) return nil;
 jobjectArray jchildrenAndRoles = (jobjectArray)JNFCallStaticObjectMethod(env, jm_getChildrenAndRoles, parent->fAccessible, parent->fComponent, whichChildren, allowIgnored); // AWT_THREADING Safe (AWTRunLoop)
 if (jchildrenAndRoles == NULL) return nil;
 jsize arrayLen = (*env)->GetArrayLength(env, jchildrenAndRoles);
 NSMutableArray *children = [NSMutableArray arrayWithCapacity:arrayLen/2]; //childrenAndRoles array contains two elements (child, role) for each child
 - (NSArray *)initializeAttributeNamesWithEnv:(JNIEnv *)env
 {
 static JNF_STATIC_MEMBER_CACHE(jm_getInitialAttributeStates, sjc_CAccessibility, "getInitialAttributeStates", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;)[Z");
-NSMutableArray *attributeNames = [NSMutableArray arrayWithCapacity:10];
+NSMutableArray *attributeNames = [NSMutableArray arrayWithCapacity:20];
 [attributeNames retain];
 // all elements respond to parent, role, role description, window, topLevelUIElement, help
 [attributeNames addObject:NSAccessibilityParentAttribute];
 [attributeNames addObject:NSAccessibilityRoleAttribute];
 }
 // children
 if (attributeStatesArray[6]) {
 [attributeNames addObject:NSAccessibilityChildrenAttribute];
+if ([javaRole isEqualToString:@"list"]) {
+[attributeNames addObject:NSAccessibilitySelectedChildrenAttribute];
+[attributeNames addObject:NSAccessibilityVisibleChildrenAttribute];
+}
+// Just above, the below mentioned support has been added back in for lists.
+// However, the following comments may still be useful for future fixes.
 //        [attributeNames addObject:NSAccessibilitySelectedChildrenAttribute];
 //        [attributeNames addObject:NSAccessibilityVisibleChildrenAttribute];
 //According to AXRoles.txt:
 //VisibleChildren: radio group, list, row, table row subrole
 //SelectedChildren: list
 }
 return isChildSelected(env, ((JavaComponentAccessibility *)[self parent])->fAccessible, fIndex, fComponent);
 }
+- (BOOL)isSelectable:(JNIEnv *)env
+{
+jobject axContext = [self axContextWithEnv:env];
+BOOL selectable = isSelectable(env, axContext, fComponent);
+(*env)->DeleteLocalRef(env, axContext);
+return selectable;
+}
 - (BOOL)isVisible:(JNIEnv *)env
 {
 if (fIndex == -1) {
 return NO;
 }
 {
 JNIEnv* env = [ThreadUtilities getJNIEnv];
 @synchronized(sAttributeNamesLOCK) {
 NSString *javaRole = [self javaRole];
-NSArray *names = (NSArray *)[sAttributeNamesForRoleCache objectForKey:javaRole];
+NSArray *names =
-if (names != nil) return names;
+(NSArray *)[sAttributeNamesForRoleCache objectForKey:javaRole];
+if (names == nil) {
 names = [self initializeAttributeNamesWithEnv:env];
-if (names != nil) {
 #ifdef JAVA_AX_DEBUG
 NSLog(@"Initializing: %s for %@: %@", __FUNCTION__, javaRole, names);
 #endif
 [sAttributeNamesForRoleCache setObject:names forKey:javaRole];
-return names;
+}
-}
+// The above set of attributes is immutable per role, but some objects, if
-}
+// they are the child of a list, need to add the selected and index attributes.
+id myParent = [self accessibilityParentAttribute];
+if ([myParent isKindOfClass:[JavaComponentAccessibility class]]) {
+NSString *parentRole = [(JavaComponentAccessibility *)myParent javaRole];
+if ([parentRole isEqualToString:@"list"]) {
+NSMutableArray *moreNames =
+[[NSMutableArray alloc] initWithCapacity: [names count] + 2];
+[moreNames addObjectsFromArray: names];
+[moreNames addObject:NSAccessibilitySelectedAttribute];
+[moreNames addObject:NSAccessibilityIndexAttribute];
+return moreNames;
+}
+}
+return names;
+}  // end @synchronized
 #ifdef JAVA_AX_DEBUG
 NSLog(@"Warning in %s: could not find attribute names for role: %@", __FUNCTION__, [self javaRole]);
 #endif
 // Elements that current element contains (NSArray)
 - (NSArray *)accessibilityChildrenAttribute
 {
 JNIEnv* env = [ThreadUtilities getJNIEnv];
-NSArray *children = [JavaComponentAccessibility childrenOfParent:self withEnv:env withChildrenCode:JAVA_AX_VISIBLE_CHILDREN allowIgnored:NO];
+NSArray *children = [JavaComponentAccessibility childrenOfParent:self
+withEnv:env
+withChildrenCode:JAVA_AX_ALL_CHILDREN
+allowIgnored:NO];
 NSArray *value = nil;
 if ([children count] > 0) {
 value = children;
 }
 // only ones that override the default implementation in NSAccessibility
 if (![[self accessibilityRoleAttribute] isEqualToString:NSAccessibilityListRole]) {
 return [super accessibilityIndexOfChild:child];
 }
-return JNFCallStaticIntMethod([ThreadUtilities getJNIEnv], sjm_getAccessibleIndexInParent, ((JavaComponentAccessibility *)child)->fAccessible, ((JavaComponentAccessibility *)child)->fComponent);
+jint returnValue =
+JNFCallStaticIntMethod( [ThreadUtilities getJNIEnv],
+sjm_getAccessibleIndexInParent,
+((JavaComponentAccessibility *)child)->fAccessible,
+((JavaComponentAccessibility *)child)->fComponent );
+return (returnValue == -1) ? NSNotFound : returnValue;
 }
 // Without this optimization accessibilityChildrenAttribute is called in order to get the entire array of children.
 - (NSArray *)accessibilityArrayAttributeValues:(NSString *)attribute index:(NSUInteger)index maxCount:(NSUInteger)maxCount {
 if ( (maxCount == 1) && [attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
 {
 JNIEnv* env = [ThreadUtilities getJNIEnv];
 jobject val = JNFCallStaticObjectMethod(env, sjm_getAccessibleDescription, fAccessible, fComponent); // AWT_THREADING Safe (AWTRunLoop)
 if (val == NULL) {
-return @"unknown";
+return nil;
 }
 NSString* str = JNFJavaToNSString(env, val);
 (*env)->DeleteLocalRef(env, val);
 return str;
 }
 - (BOOL)accessibilityIsHelpAttributeSettable
+{
+return NO;
+}
+- (NSValue *)accessibilityIndexAttribute
+{
+NSInteger index = fIndex;
+NSValue *returnValue = [NSValue value:&index withObjCType:@encode(NSInteger)];
+return returnValue;
+}
+- (BOOL)accessibilityIsIndexAttributeSettable
 {
 return NO;
 }
 // Element's maximum value (id)
 }
 - (BOOL)accessibilityIsSelectedChildrenAttributeSettable
 {
 return NO; // cmcnote: actually it should be. so need to write accessibilitySetSelectedChildrenAttribute also
+}
+- (NSNumber *)accessibilitySelectedAttribute
+{
+return [NSNumber numberWithBool:[self isSelected:[ThreadUtilities getJNIEnv]]];
+}
+- (BOOL)accessibilityIsSelectedAttributeSettable
+{
+if ([self isSelectable:[ThreadUtilities getJNIEnv]]) {
+return YES;
+} else {
+return NO;
+}
+}
+- (void)accessibilitySetSelectedAttribute:(id)value
+{
+static JNF_STATIC_MEMBER_CACHE( jm_requestSelection,
+sjc_CAccessibility,
+"requestSelection",
+"(Ljavax/accessibility/Accessible;Ljava/awt/Component;)V" );
+if ([(NSNumber*)value boolValue]) {
+JNIEnv* env = [ThreadUtilities getJNIEnv];
+JNFCallStaticVoidMethod(env, jm_requestSelection, fAccessible, fComponent); // AWT_THREADING Safe (AWTRunLoop)
+}
 }
 // Element size (NSValue)
 - (NSValue *)accessibilitySizeAttribute {
 JNIEnv* env = [ThreadUtilities getJNIEnv];
 JNIEnv* env = [ThreadUtilities getJNIEnv];
 jobject val = JNFCallStaticObjectMethod(env, sjm_getAccessibleName, fAccessible, fComponent); // AWT_THREADING Safe (AWTRunLoop)
 if (val == NULL) {
-return @"unknown";
+return nil;
 }
 NSString* str = JNFJavaToNSString(env, val);
 (*env)->DeleteLocalRef(env, val);
 return str;
 }
 * Signature: ()V
 */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessibility_focusChanged
 (JNIEnv *env, jobject jthis)
 {
 JNF_COCOA_ENTER(env);
 [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) on:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 /*
 * Class:     sun_lwawt_macosx_CAccessible
 * Method:    valueChanged
 * Signature: (I)V
 JNF_COCOA_EXIT(env);
 }
 /*
 * Class:     sun_lwawt_macosx_CAccessible
+* Method:    selectedTextChanged
+* Signature: (I)V
+*/
+JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectedTextChanged
+(JNIEnv *env, jclass jklass, jlong element)
+{
+JNF_COCOA_ENTER(env);
+[ThreadUtilities performOnMainThread:@selector(postSelectedTextChanged)
+on:(JavaComponentAccessibility *)jlong_to_ptr(element)
+withObject:nil
+waitUntilDone:NO];
+JNF_COCOA_EXIT(env);
+}
+/*
+* Class:     sun_lwawt_macosx_CAccessible
 * Method:    selectionChanged
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectionChanged
 (JNIEnv *env, jclass jklass, jlong element)
 {
 JNF_COCOA_ENTER(env);
 [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 /*
 * Class:     sun_lwawt_macosx_CAccessible
 * Method:    unregisterFromCocoaAXSystem
 * Signature: (I)V

changeset 39873	76907ae1b680
parent 38408	3c80511b8982
child 41400	71893f19fd7f