Attachment #166814 for bug #310601

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




				IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, null);
	}
	
	public void disabletestHandlerPromptsPopup() throws Exception {
		getFieldAssistWindow().open();

		sendFocusInToControl();

	 * <li>The list shows up (the bug was reporting that the list disappeared)</li>
	 * </ol>
	 */
	public void disabletestBug271339EmptyAutoActivationCharacters() throws Exception {
		getFieldAssistWindow().open();

		sendFocusInToControl();

	 * autoactivation characters have been set</li>
	 * </ol>
	 */
	public void disabletestBug271339EmptyAutoActivationCharacters2() throws Exception {
		getFieldAssistWindow().open();

		sendFocusInToControl();

	 * <li>the popup should remain open</li>
	 * </ol>
	 */
	public void disabletestBug271339EmptyAutoActivationCharacters3() throws Exception {
		getFieldAssistWindow().open();

		sendFocusInToControl();

Lines 30-37 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/FieldAssistTestSuite.java (-3 / +2 lines)
30	*/	30	*/
31	public FieldAssistTestSuite() {	31	public FieldAssistTestSuite() {
32	addTest(new TestSuite(FieldAssistAPITest.class));	32	addTest(new TestSuite(FieldAssistAPITest.class));
33	// temporarily disabling tests, see bug 275393	33	addTest(new TestSuite(ComboContentAssistCommandAdapterTest.class));
34	// addTest(new TestSuite(ComboContentAssistCommandAdapterTest.class));	34	addTest(new TestSuite(TextContentAssistCommandAdapterTest.class));
35	// addTest(new TestSuite(TextContentAssistCommandAdapterTest.class));
36	}	35	}
37	}	36	}

Lines 11-17 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/TextContentAssistCommandAdapterTest.java (+46 lines)
11	******************************************************************************/	11	******************************************************************************/
12	package org.eclipse.ui.tests.fieldassist;	12	package org.eclipse.ui.tests.fieldassist;
13		13
		14	import org.eclipse.core.commands.AbstractHandler;
		15	import org.eclipse.core.commands.ExecutionEvent;
		16	import org.eclipse.core.expressions.EvaluationResult;
		17	import org.eclipse.core.expressions.Expression;
		18	import org.eclipse.core.expressions.ExpressionInfo;
		19	import org.eclipse.core.expressions.IEvaluationContext;
14	import org.eclipse.jface.tests.fieldassist.AbstractFieldAssistWindow;	20	import org.eclipse.jface.tests.fieldassist.AbstractFieldAssistWindow;
		21	import org.eclipse.ui.ISources;
		22	import org.eclipse.ui.IWorkbenchCommandConstants;
		23	import org.eclipse.ui.PlatformUI;
		24	import org.eclipse.ui.handlers.IHandlerActivation;
		25	import org.eclipse.ui.handlers.IHandlerService;
15		26
16	public class TextContentAssistCommandAdapterTest extends	27	public class TextContentAssistCommandAdapterTest extends
17	AbstractContentAssistCommandAdapterTest {	28	AbstractContentAssistCommandAdapterTest {
Lines 20-23 Link Here
20	return new TextCommandFieldAssistWindow();	31	return new TextCommandFieldAssistWindow();
21	}	32	}
22		33
		34	/**
		35	* bug 301196: [FieldAssist] ContentAssistCommandAdapter should provide an activation expression when activating the command handler
		36	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=301196
		37	*
		38	*/
		39	public void testBug301196CorrectHandlerConflictResolution() throws Exception {
		40
		41	final boolean[] handlerInvocationIndicator = new boolean[] {false};
		42
		43	IHandlerService service = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
		44	IHandlerActivation handlerActivation = service.activateHandler(IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, new AbstractHandler() {
		45
		46	public Object execute(ExecutionEvent event) {
		47	handlerInvocationIndicator[0] = true;
		48	return null;
		49	}
		50	},new Expression() {
		51	public void collectExpressionInfo(ExpressionInfo info) {
		52	info.addVariableNameAccess(ISources.ACTIVE_SHELL_NAME);
		53	}
		54	public EvaluationResult evaluate(IEvaluationContext context) {
		55	return EvaluationResult.TRUE; // always enabled
		56	}
		57	});
		58	try {
		59	getFieldAssistWindow().open();
		60	sendFocusInToControl();
		61	executeContentAssistHandler();
		62	// assertTwoShellsUp();
		63	// The handler registered by the command adapter should win over the test handler.
		64	assertFalse("test handler should not have been activated", handlerInvocationIndicator[0]);
		65	} finally {
		66	service.deactivateHandler(handlerActivation);
		67	}
		68	}
23	}	69	}

Lines 7-12 Link Here

(-)Eclipse UI/org/eclipse/ui/fieldassist/ContentAssistCommandAdapter.java (-59 / +41 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* David Green - fix for bug 301196: [FieldAssist] ContentAssistCommandAdapter should provide an activation expression when activating the command handler
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.ui.fieldassist;	13	package org.eclipse.ui.fieldassist;
Lines 14-19 Link Here
14	import org.eclipse.core.commands.AbstractHandler;	15	import org.eclipse.core.commands.AbstractHandler;
15	import org.eclipse.core.commands.ExecutionEvent;	16	import org.eclipse.core.commands.ExecutionEvent;
16	import org.eclipse.core.commands.IHandler;	17	import org.eclipse.core.commands.IHandler;
		18	import org.eclipse.core.expressions.EvaluationResult;
		19	import org.eclipse.core.expressions.Expression;
		20	import org.eclipse.core.expressions.ExpressionInfo;
		21	import org.eclipse.core.expressions.IEvaluationContext;
17	import org.eclipse.jface.fieldassist.ContentProposalAdapter;	22	import org.eclipse.jface.fieldassist.ContentProposalAdapter;
18	import org.eclipse.jface.fieldassist.ControlDecoration;	23	import org.eclipse.jface.fieldassist.ControlDecoration;
19	import org.eclipse.jface.fieldassist.FieldDecoration;	24	import org.eclipse.jface.fieldassist.FieldDecoration;
Lines 24-38 Link Here
24	import org.eclipse.swt.SWT;	29	import org.eclipse.swt.SWT;
25	import org.eclipse.swt.events.DisposeEvent;	30	import org.eclipse.swt.events.DisposeEvent;
26	import org.eclipse.swt.events.DisposeListener;	31	import org.eclipse.swt.events.DisposeListener;
27	import org.eclipse.swt.events.FocusEvent;
28	import org.eclipse.swt.events.FocusListener;
29	import org.eclipse.swt.widgets.Control;	32	import org.eclipse.swt.widgets.Control;
		33	import org.eclipse.ui.ISources;
30	import org.eclipse.ui.IWorkbenchCommandConstants;	34	import org.eclipse.ui.IWorkbenchCommandConstants;
31	import org.eclipse.ui.PlatformUI;	35	import org.eclipse.ui.PlatformUI;
32	import org.eclipse.ui.handlers.IHandlerActivation;	36	import org.eclipse.ui.handlers.IHandlerActivation;
33	import org.eclipse.ui.handlers.IHandlerService;	37	import org.eclipse.ui.handlers.IHandlerService;
34	import org.eclipse.ui.internal.WorkbenchMessages;	38	import org.eclipse.ui.internal.WorkbenchMessages;
35	import org.eclipse.ui.keys.IBindingService;	39	import org.eclipse.ui.keys.IBindingService;
		40	import org.eclipse.ui.swt.IFocusService;
36		41
37	/**	42	/**
38	* ContentAssistCommandAdapter extends {@link ContentProposalAdapter} to invoke	43	* ContentAssistCommandAdapter extends {@link ContentProposalAdapter} to invoke
Lines 51-57 Link Here
51	*/	56	*/
52	public class ContentAssistCommandAdapter extends ContentProposalAdapter {	57	public class ContentAssistCommandAdapter extends ContentProposalAdapter {
53		58
		59	// ID used in the decoration registry.
54	private static final String CONTENT_ASSIST_DECORATION_ID = "org.eclipse.ui.fieldAssist.ContentAssistField"; //$NON-NLS-1$	60	private static final String CONTENT_ASSIST_DECORATION_ID = "org.eclipse.ui.fieldAssist.ContentAssistField"; //$NON-NLS-1$
		61
		62	// ID used when registering our control with the focus service. Since we
		63	// never test the control ID in our activation expression, we can safely use
		64	// the same ID for all controls
		65	private static final String CONTROL_ID = "org.eclipse.ui.fieldAssist.ContentAssistField.ControlID"; //$NON-NLS-1$
		66
55	private String commandId;	67	private String commandId;
56		68
57	/**	69	/**
Lines 67-76 Link Here
67	// a platform UI preference.	79	// a platform UI preference.
68	private static final int DEFAULT_AUTO_ACTIVATION_DELAY = 500;	80	private static final int DEFAULT_AUTO_ACTIVATION_DELAY = 500;
69		81
70	private IHandlerService handlerService;
71
72	private IHandlerActivation activeHandler;
73
74	private IHandler proposalHandler = new AbstractHandler() {	82	private IHandler proposalHandler = new AbstractHandler() {
75	public Object execute(ExecutionEvent event) {	83	public Object execute(ExecutionEvent event) {
76	openProposalPopup();	84	openProposalPopup();
Lines 168-183 Link Here
168	// Set a default autoactivation delay.	176	// Set a default autoactivation delay.
169	setAutoActivationDelay(DEFAULT_AUTO_ACTIVATION_DELAY);	177	setAutoActivationDelay(DEFAULT_AUTO_ACTIVATION_DELAY);
170		178
171	// Cache the handler service so we don't have to retrieve it each time	179	// Activate the handler
172	this.handlerService = (IHandlerService) PlatformUI.getWorkbench()	180	activateHandler(control);
173	.getService(IHandlerService.class);
174
175	// Add listeners to the control to manage activation of the handler
176	addListeners(control);
177
178	if (control.isFocusControl()) {
179	activateHandler();
180	}
181		181
182	if (installDecoration) {	182	if (installDecoration) {
183	// Note top left is used for compatibility with 3.2, although	183	// Note top left is used for compatibility with 3.2, although
Lines 191-221 Link Here
191		191
192	}	192	}
193		193
194	/*
195	* Add the listeners needed in order to activate the content assist command
196	* on the control.
197	*/
198	private void addListeners(Control control) {
199	control.addFocusListener(new FocusListener() {
200	public void focusLost(FocusEvent e) {
201	deactivateHandler();
202	}
203
204	public void focusGained(FocusEvent e) {
205	if (isEnabled()) {
206	activateHandler();
207	} else {
208	deactivateHandler();
209	}
210	}
211	});
212	control.addDisposeListener(new DisposeListener() {
213	public void widgetDisposed(DisposeEvent e) {
214	deactivateHandler();
215	}
216	});
217	}
218
219	/**	194	/**
220	* Return the string command ID of the command used to invoke content	195	* Return the string command ID of the command used to invoke content
221	* assist.	196	* assist.
Lines 283-308 Link Here
283	decoration.hide();	258	decoration.hide();
284	}	259	}
285	}	260	}
286	if (getControl().isFocusControl()) {
287	if (enabled) {
288	activateHandler();
289	} else {
290	deactivateHandler();
291	}
292	}
293	}
294
295	private void activateHandler() {
296	if (activeHandler == null) {
297	activeHandler = handlerService.activateHandler(commandId,
298	proposalHandler);
299	}
300	}	261	}
301		262
302	private void deactivateHandler() {	263	private void activateHandler(final Control control) {
303	if (activeHandler != null) {	264	IFocusService fs = (IFocusService) PlatformUI.getWorkbench()
304	handlerService.deactivateHandler(activeHandler);	265	.getService(IFocusService.class);
305	activeHandler = null;	266	final IHandlerService hs = (IHandlerService) PlatformUI.getWorkbench().getService(
		267	IHandlerService.class);
		268	if (fs != null && hs != null) {
		269	fs.addFocusTracker(control, CONTROL_ID);
		270	final IHandlerActivation handlerActivation = hs.activateHandler(commandId,
		271	proposalHandler, new Expression() {
		272	public EvaluationResult evaluate(IEvaluationContext context) {
		273	return context.getVariable(ISources.ACTIVE_FOCUS_CONTROL_NAME) == control
		274	&& ContentAssistCommandAdapter.this.isEnabled() ? EvaluationResult.TRUE
		275	: EvaluationResult.FALSE;
		276	}
		277
		278	public void collectExpressionInfo(final ExpressionInfo info) {
		279	info.addVariableNameAccess(ISources.ACTIVE_FOCUS_CONTROL_NAME);
		280	}
		281
		282	});
		283	control.addDisposeListener(new DisposeListener() {
		284	public void widgetDisposed(DisposeEvent e) {
		285	hs.deactivateHandler(handlerActivation);
		286	}
		287	});
306	}	288	}
307	}	289	}
308	}	290	}

Return to bug 310601

Lines 29-35 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/AbstractContentAssistCommandAdapterTest.java (-4 / +4 lines)
29	IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, null);	29	IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, null);
30	}	30	}
31		31
32	public void testHandlerPromptsPopup() throws Exception {	32	public void disabletestHandlerPromptsPopup() throws Exception {
33	getFieldAssistWindow().open();	33	getFieldAssistWindow().open();
34		34
35	sendFocusInToControl();	35	sendFocusInToControl();
Lines 51-57 Link Here
51	* <li>The list shows up (the bug was reporting that the list disappeared)</li>	51	* <li>The list shows up (the bug was reporting that the list disappeared)</li>
52	* </ol>	52	* </ol>
53	*/	53	*/
54	public void testBug271339EmptyAutoActivationCharacters() throws Exception {	54	public void disabletestBug271339EmptyAutoActivationCharacters() throws Exception {
55	getFieldAssistWindow().open();	55	getFieldAssistWindow().open();
56		56
57	sendFocusInToControl();	57	sendFocusInToControl();
Lines 74-80 Link Here
74	* autoactivation characters have been set</li>	74	* autoactivation characters have been set</li>
75	* </ol>	75	* </ol>
76	*/	76	*/
77	public void testBug271339EmptyAutoActivationCharacters2() throws Exception {	77	public void disabletestBug271339EmptyAutoActivationCharacters2() throws Exception {
78	getFieldAssistWindow().open();	78	getFieldAssistWindow().open();
79		79
80	sendFocusInToControl();	80	sendFocusInToControl();
Lines 97-103 Link Here
97	* <li>the popup should remain open</li>	97	* <li>the popup should remain open</li>
98	* </ol>	98	* </ol>
99	*/	99	*/
100	public void testBug271339EmptyAutoActivationCharacters3() throws Exception {	100	public void disabletestBug271339EmptyAutoActivationCharacters3() throws Exception {
101	getFieldAssistWindow().open();	101	getFieldAssistWindow().open();
102		102
103	sendFocusInToControl();	103	sendFocusInToControl();