Attachment #105348 for bug #229494

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 229494
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	protected void handleActivate(Event e) {
		// disarm link, back to normal state
		armed = false;
		getAccessible().setFocus(ACC.CHILDID_SELF);
		if (listeners == null)
			return;
		int size = listeners.size();

		}
		if (!isDisposed())
			setCursor(FormsResources.getHandCursor());
		triggerAccessible();
	}

	void triggerAccessible() {
		getAccessible().setFocus(ACC.CHILDID_SELF);
	}

	/**




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 */
	public void setExpanded(boolean expanded) {
		this.expanded = expanded;
		getAccessible().selectionChanged();
		redraw();
	}
	private void initAccessible() {

				e.result = getToolTipText();
			}
			public void getName(AccessibleEvent e) {
				e.result = Messages.ToggleHyperlink_accessibleName;
				if (getParent() instanceof ExpandableComposite) {
					name += Messages.ToggleHyperlink_accessibleColumn+((ExpandableComposite)getParent()).getText();
					int index = name.indexOf('&');
					if (index != -1) {
						name = name.substring(0, index) + name.substring(index + 1);
					}
				}
				e.result = name;
			}
			public void getDescription(AccessibleEvent e) {
				getName(e);

						e.detail = ACC.ROLE_TREE;
					}
					public void getState(AccessibleControlEvent e) {
						e.detail = ToggleHyperlink.this.isExpanded()
						if (ToggleHyperlink.this.getSelection())
							state |= ACC.STATE_FOCUSED;
						state |= ToggleHyperlink.this.isExpanded()
								? ACC.STATE_EXPANDED
								: ACC.STATE_COLLAPSED;
					}
					public void getValue(AccessibleControlEvent e) {
						if (e.childID == ACC.CHILDID_SELF) {
							String name = Messages.ToggleHyperlink_accessibleName;
							if (getParent() instanceof ExpandableComposite) {
								name = Messages.ToggleHyperlink_accessibleColumn+((ExpandableComposite)getParent()).getText();
								int index = name.indexOf('&');
								if (index != -1) {
									name = name.substring(0, index) + name.substring(index + 1);
								}
							}
							e.result = name;
						}
					}
				});
	}
	// set bogus childIDs on link activation to ensure state is read on expand/collapse
	void triggerAccessible() {
		getAccessible().setFocus(getAccessibleChildID());
	}
	private int getAccessibleChildID() {
		return ToggleHyperlink.this.isExpanded() ? 1 : 2;
	}
	
	private void onKeyDown(Event e) {
		if (e.keyCode==SWT.ARROW_RIGHT) {
			// expand if collapsed

Return to bug 229494

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ToggleHyperlink.java (-16 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 156-162 Link Here
156	*/	156	*/
157	public void setExpanded(boolean expanded) {	157	public void setExpanded(boolean expanded) {
158	this.expanded = expanded;	158	this.expanded = expanded;
159	getAccessible().selectionChanged();
160	redraw();	159	redraw();
161	}	160	}
162	private void initAccessible() {	161	private void initAccessible() {
Lines 165-179 Link Here
165	e.result = getToolTipText();	164	e.result = getToolTipText();
166	}	165	}
167	public void getName(AccessibleEvent e) {	166	public void getName(AccessibleEvent e) {
168	String name=Messages.ToggleHyperlink_accessibleName;	167	e.result = Messages.ToggleHyperlink_accessibleName;
169	if (getParent() instanceof ExpandableComposite) {
170	name += Messages.ToggleHyperlink_accessibleColumn+((ExpandableComposite)getParent()).getText();
171	int index = name.indexOf('&');
172	if (index != -1) {
173	name = name.substring(0, index) + name.substring(index + 1);
174	}
175	}
176	e.result = name;
177	}	168	}
178	public void getDescription(AccessibleEvent e) {	169	public void getDescription(AccessibleEvent e) {
179	getName(e);	170	getName(e);
Lines 211-226 Link Here
211	e.detail = ACC.ROLE_TREE;	202	e.detail = ACC.ROLE_TREE;
212	}	203	}
213	public void getState(AccessibleControlEvent e) {	204	public void getState(AccessibleControlEvent e) {
214	int state = ACC.STATE_FOCUSABLE;	205	e.detail = ToggleHyperlink.this.isExpanded()
215	if (ToggleHyperlink.this.getSelection())
216	state \|= ACC.STATE_FOCUSED;
217	state \|= ToggleHyperlink.this.isExpanded()
218	? ACC.STATE_EXPANDED	206	? ACC.STATE_EXPANDED
219	: ACC.STATE_COLLAPSED;	207	: ACC.STATE_COLLAPSED;
220	e.detail = state;	208	}
		209	public void getValue(AccessibleControlEvent e) {
		210	if (e.childID == ACC.CHILDID_SELF) {
		211	String name = Messages.ToggleHyperlink_accessibleName;
		212	if (getParent() instanceof ExpandableComposite) {
		213	name = Messages.ToggleHyperlink_accessibleColumn+((ExpandableComposite)getParent()).getText();
		214	int index = name.indexOf('&');
		215	if (index != -1) {
		216	name = name.substring(0, index) + name.substring(index + 1);
		217	}
		218	}
		219	e.result = name;
		220	}
221	}	221	}
222	});	222	});
223	}	223	}
		224	// set bogus childIDs on link activation to ensure state is read on expand/collapse
		225	void triggerAccessible() {
		226	getAccessible().setFocus(getAccessibleChildID());
		227	}
		228	private int getAccessibleChildID() {
		229	return ToggleHyperlink.this.isExpanded() ? 1 : 2;
		230	}
		231
224	private void onKeyDown(Event e) {	232	private void onKeyDown(Event e) {
225	if (e.keyCode==SWT.ARROW_RIGHT) {	233	if (e.keyCode==SWT.ARROW_RIGHT) {
226	// expand if collapsed	234	// expand if collapsed

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/AbstractHyperlink.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 215-221 Link Here
215	protected void handleActivate(Event e) {	215	protected void handleActivate(Event e) {
216	// disarm link, back to normal state	216	// disarm link, back to normal state
217	armed = false;	217	armed = false;
218	getAccessible().setFocus(ACC.CHILDID_SELF);
219	if (listeners == null)	218	if (listeners == null)
220	return;	219	return;
221	int size = listeners.size();	220	int size = listeners.size();
Lines 229-234 Link Here
229	}	228	}
230	if (!isDisposed())	229	if (!isDisposed())
231	setCursor(FormsResources.getHandCursor());	230	setCursor(FormsResources.getHandCursor());
		231	triggerAccessible();
		232	}
		233
		234	void triggerAccessible() {
		235	getAccessible().setFocus(ACC.CHILDID_SELF);
232	}	236	}
233		237
234	/**	238	/**