ensure sdk mgr for both pref page and portal layer
authordadubrow
Tue, 03 Aug 2010 14:42:22 -0500
changeset 1756 bd6f1436505a
parent 1754 a1e1c11d5a44
child 1759 abac0db1cb52
ensure sdk mgr for both pref page and portal layer
core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Aug 03 14:05:25 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Aug 03 14:42:22 2010 -0500
@@ -104,7 +104,8 @@
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
 	public void init(IWorkbench workbench) {
-		sdkMgr = SDKCorePlugin.getSDKManager();
+		if (sdkMgr == null)
+			sdkMgr = SDKCorePlugin.getSDKManager();
 		if (sdkMgr != null)
 			sdkList = sdkMgr.getSDKList();
 	}
@@ -115,6 +116,8 @@
 	public void createControl(Composite parent) {
 		
 		IPreferenceStore prefsStore = SDKUIPlugin.getDefault().getPreferenceStore();
+		if (sdkMgr == null)
+			sdkMgr = SDKCorePlugin.getSDKManager();
 		if (sdkMgr == null){
 			return; 
 		}