Skip to content

Commit 6ac2dd3

Browse files
Alexander ZuevAndy Goryachev
Alexander Zuev
authored and
Andy Goryachev
committed
8336031: Create implementation of NSAccessibilityStaticText protocol
Reviewed-by: angorya, arapte
1 parent f5b18ad commit 6ac2dd3

File tree

3 files changed

+95
-2
lines changed

3 files changed

+95
-2
lines changed

modules/javafx.graphics/src/main/native-glass/mac/a11y/AccessibleBase.m

+5-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ @implementation AccessibleBase
3636

3737
+ (void) initializeRolesMap {
3838
/*
39-
* Here we should keep all the mapping between the accessibility roles and implementing classes
39+
* Here we should keep all the mapping between the accessibility roles and implementing classes.
40+
* All JavaFX roles and corresponding available properties are defined in
41+
* enum javafx.scene.AccessibleRole
4042
*/
41-
rolesMap = [[NSMutableDictionary alloc] initWithCapacity:8];
43+
rolesMap = [[NSMutableDictionary alloc] initWithCapacity:9];
4244

4345
[rolesMap setObject:@"JFXButtonAccessibility" forKey:@"BUTTON"];
4446
[rolesMap setObject:@"JFXButtonAccessibility" forKey:@"DECREMENT_BUTTON"];
@@ -50,6 +52,7 @@ + (void) initializeRolesMap {
5052
[rolesMap setObject:@"JFXRadiobuttonAccessibility" forKey:@"PAGE_ITEM"];
5153
[rolesMap setObject:@"JFXCheckboxAccessibility" forKey:@"CHECK_BOX"];
5254
[rolesMap setObject:@"JFXCheckboxAccessibility" forKey:@"TOGGLE_BUTTON"];
55+
[rolesMap setObject:@"JFXStaticTextAccessibility" forKey:@"TEXT"];
5356

5457
}
5558

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
#import "AccessibleBase.h"
27+
#import <AppKit/NSAccessibility.h>
28+
29+
@interface JFXStaticTextAccessibility : AccessibleBase<NSAccessibilityStaticText> {
30+
31+
};
32+
- (NSAccessibilityRole)accessibilityRole;
33+
- (NSString *)accessibilityValue;
34+
@end
35+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
#import "JFXStaticTextAccessibility.h"
27+
#import "GlassMacros.h"
28+
#import "GlassAccessible.h"
29+
#import "com_sun_glass_ui_mac_MacAccessible.h"
30+
#import "com_sun_glass_ui_mac_MacVariant.h"
31+
#import "common.h"
32+
33+
@implementation JFXStaticTextAccessibility
34+
- (NSAccessibilityRole)accessibilityRole
35+
{
36+
return NSAccessibilityStaticTextRole;
37+
}
38+
39+
- (id)accessibilityParent
40+
{
41+
return [super accessibilityParent];
42+
}
43+
44+
- (NSRect)accessibilityFrame
45+
{
46+
return [super accessibilityFrame];
47+
}
48+
49+
- (NSString *)accessibilityValue
50+
{
51+
return [super accessibilityValue];
52+
}
53+
54+
@end
55+

0 commit comments

Comments
 (0)