Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2008-04-30 04:43:18 +0000
committerspingel2008-04-30 04:43:18 +0000
commit1e286420c3d72571044a5042c238bdbdef56e7b6 (patch)
tree7077a89cd7477912ef97b6283149432e4a1ccd1f /org.eclipse.mylyn.tasks.ui
parentde09b74653c4485666b50ad0bd78de74ffca97a0 (diff)
downloadorg.eclipse.mylyn.tasks-1e286420c3d72571044a5042c238bdbdef56e7b6.tar.gz
org.eclipse.mylyn.tasks-1e286420c3d72571044a5042c238bdbdef56e7b6.tar.xz
org.eclipse.mylyn.tasks-1e286420c3d72571044a5042c238bdbdef56e7b6.zip
RESOLVED - bug 221158: do not focus on the summary field when moving between editors
https://bugs.eclipse.org/bugs/show_bug.cgi?id=221158
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java3
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index 016b7b567..b6bb30677 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -829,6 +829,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
for (Control control : editorComposite.getChildren()) {
control.dispose();
}
+ lastFocusControl = null;
}
/**
@@ -2857,7 +2858,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
@Override
public void setFocus() {
- if (lastFocusControl != null) {
+ if (lastFocusControl != null && !lastFocusControl.isDisposed()) {
lastFocusControl.setFocus();
} else if (firstFocus && summaryTextViewer != null) {
summaryTextViewer.getControl().setFocus();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
index 1dc1c25ea..12482ae12 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
@@ -743,6 +743,7 @@ public abstract class AbstractTaskEditorPage extends FormPage {
for (Control control : editorComposite.getChildren()) {
control.dispose();
}
+ lastFocusControl = null;
// restore menu
editorComposite.setMenu(menu);
@@ -807,7 +808,7 @@ public abstract class AbstractTaskEditorPage extends FormPage {
@Override
public void setFocus() {
- if (lastFocusControl != null) {
+ if (lastFocusControl != null && !lastFocusControl.isDisposed()) {
lastFocusControl.setFocus();
}
}

Back to the top