15815: Prompt for save changes active window...
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 9b575fb..46adb75 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -367,9 +367,10 @@
private boolean saveAllEditors() {
final int option = CVSUIPlugin.getPlugin().getPreferenceStore().getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS);
final boolean[] okToContinue = new boolean[] {true};
- if(option != ICVSUIConstants.OPTION_NEVER) {
+ if (option != ICVSUIConstants.OPTION_NEVER) {
Display.getDefault().syncExec(new Runnable() {
public void run() {
+ IWorkbenchPage oldPage = CVSUIPlugin.getActivePage();
boolean confirm = option == ICVSUIConstants.OPTION_PROMPT;
IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
for (int i = 0; i < windows.length; i++) {
@@ -378,6 +379,9 @@
okToContinue[0] = pages[j].saveAllEditors(confirm);
}
}
+ if (oldPage != null) {
+ oldPage.getWorkbenchWindow().getShell().setFocus();
+ }
}
});
}
