Bug 11195 Regression. Avoid having perspective switch dialog dismissed or deadlocked by passing in the active shell.
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Tue May 04 11:32:39 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Wed May 05 12:37:26 2010 -0500
@@ -49,6 +49,7 @@
import com.nokia.carbide.cpp.internal.project.ui.dialogs.UpdateProjectFilesQuery;
import com.nokia.carbide.cpp.internal.project.ui.preferences.PreferenceConstants;
import com.nokia.cpp.internal.api.utils.core.Logging;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
/**
* The activator class controls the plug-in life cycle
@@ -210,7 +211,7 @@
}
else if ((promptSetting.equals(MessageDialogWithToggle.PROMPT))) {
MessageDialogWithToggle toggleDialog = MessageDialogWithToggle.openYesNoQuestion(
- null,
+ WorkbenchUtils.getActiveShell(),
Messages.getString("PerspectiveSwitchDialog_Title"),
Messages.getString("PerspectiveSwitchDialog_Query"),
Messages.getString("PerspectiveSwitchDialog_RememberDecisionText"),
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java Tue May 04 11:32:39 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java Wed May 05 12:37:26 2010 -0500
@@ -47,6 +47,7 @@
import com.nokia.carbide.cpp.internal.qt.core.QtSDKUtils;
import com.nokia.carbide.cpp.internal.qt.ui.wizard.Messages;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
public class QtUIPlugin extends AbstractUIPlugin implements ICarbideConfigurationChangedListener, ISDKManagerLoadedHook {
@@ -156,7 +157,7 @@
}
else if ((promptSetting.equals(MessageDialogWithToggle.PROMPT))) {
MessageDialogWithToggle toggleDialog = MessageDialogWithToggle.openYesNoQuestion(
- null,
+ WorkbenchUtils.getActiveShell(),
Messages.PerspectiveSwitchDialog_Title,
Messages.PerspectiveSwitchDialog_Query,
Messages.PerspectiveSwitchDialog_RememberDecisionText,