Attachment 92094 Details for Bug 221158 – possible Fix

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

[patch] possible Fix

patch221158.txt (text/plain), 4.98 KB, created by Frank Becker

on 2008-03-10 17:46:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2008-03-10 17:46:16 EDT

Size: 4.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java,v
>retrieving revision 1.105
>diff -u -r1.105 TaskPlanningEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java	1 Mar 2008 21:38:51 -0000	1.105
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java	10 Mar 2008 21:44:33 -0000
>@@ -48,6 +48,8 @@
> import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.CCombo;
>+import org.eclipse.swt.events.FocusEvent;
>+import org.eclipse.swt.events.FocusListener;
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.events.KeyListener;
> import org.eclipse.swt.events.ModifyEvent;
>@@ -354,6 +356,11 @@
> 	@Override
> 	public void setFocus() {
> 		// form.setFocus();
>+		if (focusedControl != null) {
>+			focusedControl.setFocus();
>+			return;
>+		}
>+
> 		if (summaryEditor != null && summaryEditor.getTextWidget() != null
> 				&& !summaryEditor.getTextWidget().isDisposed()) {
> 			summaryEditor.getTextWidget().setFocus();
>@@ -528,6 +535,17 @@
> 					markDirty(true);
> 				}
> 			});
>+			issueReportURL.addFocusListener(new FocusListener() {
>+
>+				public void focusGained(FocusEvent e) {
>+					focusedControl = (Control) e.widget;
>+				}
>+
>+				public void focusLost(FocusEvent e) {
>+					// ignore
>+
>+				}
>+			});
> 		}
> 
> 		getDescLink = toolkit.createImageHyperlink(urlComposite, SWT.NONE);
>@@ -745,6 +763,16 @@
> 			}
> 		});
> 
>+		estimated.addFocusListener(new FocusListener() {
>+			public void focusGained(FocusEvent e) {
>+				focusedControl = (Control) e.widget;
>+			}
>+
>+			public void focusLost(FocusEvent e) {
>+				// ignore
>+			}
>+		});
>+
> 		estimated.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
> 		toolkit.paintBordersFor(nameValueComp);
> 		GridData estimatedDataLayout = new GridData();
>Index: src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java,v
>retrieving revision 1.20
>diff -u -r1.20 TaskFormPage.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java	6 Mar 2008 08:08:42 -0000	1.20
>+++ src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java	10 Mar 2008 21:44:33 -0000
>@@ -40,8 +40,8 @@
> import org.eclipse.jface.text.source.SourceViewer;
> import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
> import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewer;
>-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor;
> import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration;
>+import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.StyledText;
>@@ -93,6 +93,8 @@
> 
> 	protected boolean isDirty;
> 
>+	public Control focusedControl;
>+
> 	private TaskEditor taskEditor = null;
> 
> 	protected TaskEditorActionContributor actionContributor;
>@@ -279,7 +281,8 @@
> 		// order for
> 		// Hyperlink colouring to work. (Presenter needs document object up
> 		// front)
>-		RepositoryTextViewerConfiguration repositoryViewerConfig = new RepositoryTextViewerConfiguration(repository, false);
>+		RepositoryTextViewerConfiguration repositoryViewerConfig = new RepositoryTextViewerConfiguration(repository,
>+				false);
> 		commentViewer.configure(repositoryViewerConfig);
> 
> 		IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
>@@ -370,6 +373,8 @@
> 		commentViewer.getTextWidget().addFocusListener(new FocusListener() {
> 
> 			public void focusGained(FocusEvent e) {
>+				StyledText st = (StyledText) e.widget;
>+				focusedControl = st;
> 				actionContributor.updateSelectableActions(commentViewer.getSelection());
> 				activate();
> 			}
>Index: src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java,v
>retrieving revision 1.73
>diff -u -r1.73 TaskEditor.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java	1 Mar 2008 21:38:51 -0000	1.73
>+++ src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java	10 Mar 2008 21:44:33 -0000
>@@ -372,7 +372,9 @@
> 
> 	@Override
> 	public void setFocus() {
>-		if (getActivePageInstance() instanceof AbstractNewRepositoryTaskEditor) {
>+		IFormPage a = getActivePageInstance();
>+		if (getActivePageInstance() instanceof AbstractNewRepositoryTaskEditor
>+				|| getActivePageInstance() instanceof TaskPlanningEditor) {
> 			getActivePageInstance().setFocus();
> 		} else {
> 			super.setFocus();

Actions: View | Diff

Attachments on bug 221158: 92094 | 92095 | 97911 | 98118 | 104797 | 104800