# HG changeset patch
# User stechong
# Date 1276531631 18000
# Node ID 48201eb479999d1af825832a4ecd7bd0d1b7d35b
# Parent  bf2b5be81802a8ed8a675b0690c9143a07353f4f
When scanning system drives for installed SDKs, default SDK version to 5.0 when no SDK version info is available; also updated SDK properties dialog to correctly display SDK version string.

diff -r bf2b5be81802 -r 48201eb47999 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Jun 14 08:34:05 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Jun 14 11:07:11 2010 -0500
@@ -432,9 +432,14 @@
 				((SymbianSDK)sdk).setOSVersion(new Version("9.5"));
 			}
 
+			if (sdk.getSDKVersion().toString().equals("0.0.0")) {
+				((SymbianSDK)sdk).setSDKVersion(new Version("5.0"));
+			}
+
 			if (!isSupportedSDK(sdk)) {
 				continue;
 			}
+
 			if (isInSDKList(sdk)) {
 				continue;
 			}
diff -r bf2b5be81802 -r 48201eb47999 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPropertiesDialog.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPropertiesDialog.java	Mon Jun 14 08:34:05 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPropertiesDialog.java	Mon Jun 14 11:07:11 2010 -0500
@@ -93,7 +93,7 @@
 		// SDK Version at Row 2.
 		TableItem itemSDKVersion = new TableItem(propsTable, SWT.NONE);
 		String sdkVersion = sdk.getSDKVersion().toString();
-		itemSDKVersion.setText(new String[] {Messages.getString("SDKPropertiesDialog.OS_Version"), sdkVersion}); //$NON-NLS-1$
+		itemSDKVersion.setText(new String[] {Messages.getString("SDKPropertiesDialog.SDK_Version"), sdkVersion}); //$NON-NLS-1$
 		
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, SDKUIHelpIds.SDK_PROPERTIES_DIALOG);
 		
diff -r bf2b5be81802 -r 48201eb47999 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties	Mon Jun 14 08:34:05 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties	Mon Jun 14 11:07:11 2010 -0500
@@ -3,6 +3,7 @@
 SDKPropertiesDialog.Property=Property
 SDKPropertiesDialog.Value=Value
 SDKPropertiesDialog.OS_Version=OS Version
+SDKPropertiesDialog.SDK_Version=SDK Version
 
 SDKPreferencePage.Browse_Location_Label=...
 SDKPreferencePage.Add_Button_Label=Add