Attachment #92094 for bug #221158

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

Lines 48-53 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java (+28 lines)
48	import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage;	48	import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage;
49	import org.eclipse.swt.SWT;	49	import org.eclipse.swt.SWT;
50	import org.eclipse.swt.custom.CCombo;	50	import org.eclipse.swt.custom.CCombo;
		51	import org.eclipse.swt.events.FocusEvent;
		52	import org.eclipse.swt.events.FocusListener;
51	import org.eclipse.swt.events.KeyEvent;	53	import org.eclipse.swt.events.KeyEvent;
52	import org.eclipse.swt.events.KeyListener;	54	import org.eclipse.swt.events.KeyListener;
53	import org.eclipse.swt.events.ModifyEvent;	55	import org.eclipse.swt.events.ModifyEvent;
Lines 354-359 Link Here
354	@Override	356	@Override
355	public void setFocus() {	357	public void setFocus() {
356	// form.setFocus();	358	// form.setFocus();
		359	if (focusedControl != null) {
		360	focusedControl.setFocus();
		361	return;
		362	}
		363
357	if (summaryEditor != null && summaryEditor.getTextWidget() != null	364	if (summaryEditor != null && summaryEditor.getTextWidget() != null
358	&& !summaryEditor.getTextWidget().isDisposed()) {	365	&& !summaryEditor.getTextWidget().isDisposed()) {
359	summaryEditor.getTextWidget().setFocus();	366	summaryEditor.getTextWidget().setFocus();
Lines 528-533 Link Here
528	markDirty(true);	535	markDirty(true);
529	}	536	}
530	});	537	});
		538	issueReportURL.addFocusListener(new FocusListener() {
		539
		540	public void focusGained(FocusEvent e) {
		541	focusedControl = (Control) e.widget;
		542	}
		543
		544	public void focusLost(FocusEvent e) {
		545	// ignore
		546
		547	}
		548	});
531	}	549	}
532		550
533	getDescLink = toolkit.createImageHyperlink(urlComposite, SWT.NONE);	551	getDescLink = toolkit.createImageHyperlink(urlComposite, SWT.NONE);
Lines 745-750 Link Here
745	}	763	}
746	});	764	});
747		765
		766	estimated.addFocusListener(new FocusListener() {
		767	public void focusGained(FocusEvent e) {
		768	focusedControl = (Control) e.widget;
		769	}
		770
		771	public void focusLost(FocusEvent e) {
		772	// ignore
		773	}
		774	});
		775
748	estimated.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);	776	estimated.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
749	toolkit.paintBordersFor(nameValueComp);	777	toolkit.paintBordersFor(nameValueComp);
750	GridData estimatedDataLayout = new GridData();	778	GridData estimatedDataLayout = new GridData();

Lines 40-47 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java (-2 / +7 lines)
40	import org.eclipse.jface.text.source.SourceViewer;	40	import org.eclipse.jface.text.source.SourceViewer;
41	import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;	41	import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
42	import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewer;	42	import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewer;
43	import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor;
44	import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration;	43	import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration;
		44	import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor;
45	import org.eclipse.mylyn.tasks.core.TaskRepository;	45	import org.eclipse.mylyn.tasks.core.TaskRepository;
46	import org.eclipse.swt.SWT;	46	import org.eclipse.swt.SWT;
47	import org.eclipse.swt.custom.StyledText;	47	import org.eclipse.swt.custom.StyledText;
Lines 93-98 Link Here
93		93
94	protected boolean isDirty;	94	protected boolean isDirty;
95		95
		96	public Control focusedControl;
		97
96	private TaskEditor taskEditor = null;	98	private TaskEditor taskEditor = null;
97		99
98	protected TaskEditorActionContributor actionContributor;	100	protected TaskEditorActionContributor actionContributor;
Lines 279-285 Link Here
279	// order for	281	// order for
280	// Hyperlink colouring to work. (Presenter needs document object up	282	// Hyperlink colouring to work. (Presenter needs document object up
281	// front)	283	// front)
282	RepositoryTextViewerConfiguration repositoryViewerConfig = new RepositoryTextViewerConfiguration(repository, false);	284	RepositoryTextViewerConfiguration repositoryViewerConfig = new RepositoryTextViewerConfiguration(repository,
		285	false);
283	commentViewer.configure(repositoryViewerConfig);	286	commentViewer.configure(repositoryViewerConfig);
284		287
285	IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();	288	IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
Lines 370-375 Link Here
370	commentViewer.getTextWidget().addFocusListener(new FocusListener() {	373	commentViewer.getTextWidget().addFocusListener(new FocusListener() {
371		374
372	public void focusGained(FocusEvent e) {	375	public void focusGained(FocusEvent e) {
		376	StyledText st = (StyledText) e.widget;
		377	focusedControl = st;
373	actionContributor.updateSelectableActions(commentViewer.getSelection());	378	actionContributor.updateSelectableActions(commentViewer.getSelection());
374	activate();	379	activate();
375	}	380	}

Lines 372-378 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java (-1 / +3 lines)
372		372
373	@Override	373	@Override
374	public void setFocus() {	374	public void setFocus() {
375	if (getActivePageInstance() instanceof AbstractNewRepositoryTaskEditor) {	375	IFormPage a = getActivePageInstance();
		376	if (getActivePageInstance() instanceof AbstractNewRepositoryTaskEditor
		377	\|\| getActivePageInstance() instanceof TaskPlanningEditor) {
376	getActivePageInstance().setFocus();	378	getActivePageInstance().setFocus();
377	} else {	379	} else {
378	super.setFocus();	380	super.setFocus();

Return to bug 221158